diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 00000000..2b86d112 --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,19 @@ +# NHS.UK prototype kit Changelog + +## 1.0.1 - Feb 21, 2019 + +:new: **New features** + +- [Installation guides update for Windows and Mac following testing with users](https://github.com/nhsuk/nhsuk-prototype-kit/pull/68) +- The prototype kit now is properly versioned and is the version is indicated in `package.json` `version` field and also on the index page of the docs. + +:wrench: **Fixes** + +- [Header and footer inconsistency on the branching examples](https://github.com/nhsuk/nhsuk-prototype-kit/issues/71) +- Fix inconsistencies with page titles, should be `Page name - NHS.UK prototype kit` + +## 1.0.0 - Feb 5, 2019 + +:tada: **Official release of the NHS.UK prototype kit** + +- v1.0.0 of the NHS.UK prototype kit! diff --git a/app.js b/app.js index 83d0971b..6830d953 100755 --- a/app.js +++ b/app.js @@ -14,6 +14,7 @@ const sessionInMemory = require('express-session') dotenv.config() // Local dependencies +const packageInfo = require('./package.json'); const authentication = require('./middleware/authentication'); const automaticRouting = require('./middleware/auto-routing'); const config = require('./app/config'); @@ -56,7 +57,8 @@ var nunjucksConfig = { nunjucksConfig.express = app -var nunjucksAppEnv = nunjucks.configure(appViews, nunjucksConfig) +var nunjucksAppEnv = nunjucks.configure(appViews, nunjucksConfig); +nunjucksAppEnv.addGlobal('version', packageInfo.version); // Add Nunjucks filters utils.addNunjucksFilters(nunjucksAppEnv) @@ -186,6 +188,7 @@ if (useDocumentation || onlyDocumentation == 'true') { autoescape: true, express: documentationApp }); + nunjucksAppEnv.addGlobal('version', packageInfo.version); // Add Nunjucks filters utils.addNunjucksFilters(nunjucksAppEnv) diff --git a/app/assets/sass/main.scss b/app/assets/sass/main.scss index d51f4650..d9752070 100755 --- a/app/assets/sass/main.scss +++ b/app/assets/sass/main.scss @@ -8,4 +8,6 @@ @import 'components/panel-confirmation'; @import 'components/related-nav'; -// Add your extra styles here... +/////////////////////////////////////////// +// Add your custom CSS/Sass styles below... +/////////////////////////////////////////// diff --git a/app/views/examples/branching/answer-no.html b/app/views/examples/branching/answer-no.html index 8dc11839..649bc716 100644 --- a/app/views/examples/branching/answer-no.html +++ b/app/views/examples/branching/answer-no.html @@ -1,4 +1,4 @@ -{% extends "layouts/layout.html" %} +{% extends "layouts/layout-transactional.html" %} {% set mainClasses = 'nhsuk-main-wrapper--s' %} diff --git a/app/views/examples/branching/answer-yes.html b/app/views/examples/branching/answer-yes.html index 95e8c6fe..177570fa 100644 --- a/app/views/examples/branching/answer-yes.html +++ b/app/views/examples/branching/answer-yes.html @@ -1,4 +1,4 @@ -{% extends "layouts/layout.html" %} +{% extends "layouts/layout-transactional.html" %} {% set mainClasses = 'nhsuk-main-wrapper--s' %} diff --git a/app/views/index.html b/app/views/index.html index e8fe4c12..e4e664b5 100755 --- a/app/views/index.html +++ b/app/views/index.html @@ -1,9 +1,15 @@ + + + {% extends 'layouts/layout.html' %} {% block pageTitle %} - Prototype kit + NHS.UK prototype kit {% endblock %} @@ -14,13 +20,13 @@
- +

NHS.UK prototype kit + Version {{version}}

- - +

This kit lets you rapidly create HTML prototypes of NHS services.

@@ -33,7 +39,7 @@

About this page

Examples and documentation

diff --git a/app/views/layouts/layout-nhsuk.html b/app/views/layouts/layout-nhsuk.html index 10104c09..1d2642c1 100755 --- a/app/views/layouts/layout-nhsuk.html +++ b/app/views/layouts/layout-nhsuk.html @@ -5,7 +5,7 @@ {% block pageTitle %} - NHS.UK prototype kit - NHS.UK page layout + NHS.UK page layout - NHS.UK prototype kit {% endblock %} diff --git a/app/views/templates/blank-nhsuk.html b/app/views/templates/blank-nhsuk.html index 78570e30..b75bcb78 100755 --- a/app/views/templates/blank-nhsuk.html +++ b/app/views/templates/blank-nhsuk.html @@ -1,7 +1,7 @@ {% extends 'layouts/layout-nhsuk.html' %} {% block pageTitle %} - NHS.UK prototype kit - Blank template + Blank template - NHS.UK prototype kit {% endblock %} {% block beforeContent %} diff --git a/app/views/templates/blank-transactional.html b/app/views/templates/blank-transactional.html index 9c9d1069..5ff3dfa7 100755 --- a/app/views/templates/blank-transactional.html +++ b/app/views/templates/blank-transactional.html @@ -1,7 +1,7 @@ {% extends 'layouts/layout-transactional.html' %} {% block pageTitle %} - NHS.UK prototype kit - Blank transactional template + Blank transactional template - NHS.UK prototype kit {% endblock %} {% block beforeContent %} diff --git a/app/views/templates/check-your-answers.html b/app/views/templates/check-your-answers.html index 492b7043..118445c5 100755 --- a/app/views/templates/check-your-answers.html +++ b/app/views/templates/check-your-answers.html @@ -1,7 +1,7 @@ {% extends 'layouts/layout-transactional.html' %} {% block pageTitle %} - NHS.UK prototype kit - Check your answers template + Check your answers template - NHS.UK prototype kit {% endblock %} {% block content %} diff --git a/app/views/templates/confirmation-page.html b/app/views/templates/confirmation-page.html index 4885019a..15c318e4 100755 --- a/app/views/templates/confirmation-page.html +++ b/app/views/templates/confirmation-page.html @@ -1,7 +1,7 @@ {% extends 'layouts/layout-transactional.html' %} {% block pageTitle %} - NHS.UK prototype kit - Confirmation page template + Confirmation page template - NHS.UK prototype kit {% endblock %} {% block content %} diff --git a/app/views/templates/content-page.html b/app/views/templates/content-page.html index 54cc563c..109bed5d 100755 --- a/app/views/templates/content-page.html +++ b/app/views/templates/content-page.html @@ -1,7 +1,7 @@ {% extends 'layouts/layout-nhsuk.html' %} {% block pageTitle %} - NHS.UK prototype Kit - Content page template + Content page template - NHS.UK prototype kit {% endblock %} {% block beforeContent %} diff --git a/app/views/templates/start-page.html b/app/views/templates/start-page.html index e785798c..8b09993d 100755 --- a/app/views/templates/start-page.html +++ b/app/views/templates/start-page.html @@ -1,7 +1,7 @@ {% extends 'layouts/layout-nhsuk.html' %} {% block pageTitle %} - NHS.UK prototype kit - Start page template + Start page template - NHS.UK prototype kit {% endblock %} {% block beforeContent %} diff --git a/docs/assets/images/mac/download-folder.png b/docs/assets/images/mac/download-folder.png new file mode 100755 index 00000000..cfb67b7f Binary files /dev/null and b/docs/assets/images/mac/download-folder.png differ diff --git a/docs/assets/images/mac/download-move.png b/docs/assets/images/mac/download-move.png new file mode 100755 index 00000000..9a25d984 Binary files /dev/null and b/docs/assets/images/mac/download-move.png differ diff --git a/docs/assets/images/mac/download-rename.png b/docs/assets/images/mac/download-rename.png new file mode 100755 index 00000000..1e2cd37b Binary files /dev/null and b/docs/assets/images/mac/download-rename.png differ diff --git a/docs/assets/images/mac/download-unzip.png b/docs/assets/images/mac/download-unzip.png new file mode 100755 index 00000000..80a19b0e Binary files /dev/null and b/docs/assets/images/mac/download-unzip.png differ diff --git a/docs/assets/images/mac/terminal-folder.png b/docs/assets/images/mac/terminal-folder.png new file mode 100755 index 00000000..c0fa58eb Binary files /dev/null and b/docs/assets/images/mac/terminal-folder.png differ diff --git a/docs/assets/images/mac/terminal-node-version.png b/docs/assets/images/mac/terminal-node-version.png index 3b24201d..ca83dc7a 100755 Binary files a/docs/assets/images/mac/terminal-node-version.png and b/docs/assets/images/mac/terminal-node-version.png differ diff --git a/docs/assets/images/mac/terminal-node.png b/docs/assets/images/mac/terminal-node.png index eb9584b0..db403816 100755 Binary files a/docs/assets/images/mac/terminal-node.png and b/docs/assets/images/mac/terminal-node.png differ diff --git a/docs/assets/images/mac/terminal-npm-run-3000.png b/docs/assets/images/mac/terminal-npm-run-3000.png new file mode 100755 index 00000000..88cade14 Binary files /dev/null and b/docs/assets/images/mac/terminal-npm-run-3000.png differ diff --git a/docs/assets/images/mac/terminal-npm-run.png b/docs/assets/images/mac/terminal-npm-run.png index 68c70b0c..052992e5 100755 Binary files a/docs/assets/images/mac/terminal-npm-run.png and b/docs/assets/images/mac/terminal-npm-run.png differ diff --git a/docs/assets/images/mac/terminal.png b/docs/assets/images/mac/terminal.png index a214c0fa..1a37389e 100755 Binary files a/docs/assets/images/mac/terminal.png and b/docs/assets/images/mac/terminal.png differ diff --git a/docs/assets/images/windows/cd.png b/docs/assets/images/windows/cd.png new file mode 100644 index 00000000..8e6b15f2 Binary files /dev/null and b/docs/assets/images/windows/cd.png differ diff --git a/docs/assets/images/windows/command-prompt-open.png b/docs/assets/images/windows/command-prompt-open.png new file mode 100644 index 00000000..46b98299 Binary files /dev/null and b/docs/assets/images/windows/command-prompt-open.png differ diff --git a/docs/assets/images/windows/command-prompt.png b/docs/assets/images/windows/command-prompt.png new file mode 100644 index 00000000..d0cfbfbd Binary files /dev/null and b/docs/assets/images/windows/command-prompt.png differ diff --git a/docs/assets/images/windows/download-folder.png b/docs/assets/images/windows/download-folder.png new file mode 100644 index 00000000..c6794a0c Binary files /dev/null and b/docs/assets/images/windows/download-folder.png differ diff --git a/docs/assets/images/windows/download-move.png b/docs/assets/images/windows/download-move.png new file mode 100644 index 00000000..dadbff21 Binary files /dev/null and b/docs/assets/images/windows/download-move.png differ diff --git a/docs/assets/images/windows/download-rename.png b/docs/assets/images/windows/download-rename.png new file mode 100644 index 00000000..2e681aed Binary files /dev/null and b/docs/assets/images/windows/download-rename.png differ diff --git a/docs/assets/images/windows/download-unzip-open.png b/docs/assets/images/windows/download-unzip-open.png new file mode 100644 index 00000000..10981145 Binary files /dev/null and b/docs/assets/images/windows/download-unzip-open.png differ diff --git a/docs/assets/images/windows/download-unzip.png b/docs/assets/images/windows/download-unzip.png new file mode 100644 index 00000000..97abb3d0 Binary files /dev/null and b/docs/assets/images/windows/download-unzip.png differ diff --git a/docs/assets/images/windows/node-check.png b/docs/assets/images/windows/node-check.png new file mode 100644 index 00000000..56837d0b Binary files /dev/null and b/docs/assets/images/windows/node-check.png differ diff --git a/docs/assets/images/windows/node-version.png b/docs/assets/images/windows/node-version.png new file mode 100644 index 00000000..4e5dd469 Binary files /dev/null and b/docs/assets/images/windows/node-version.png differ diff --git a/docs/assets/images/windows/node.png b/docs/assets/images/windows/node.png new file mode 100644 index 00000000..35fa0bc3 Binary files /dev/null and b/docs/assets/images/windows/node.png differ diff --git a/docs/assets/images/windows/npm-install.png b/docs/assets/images/windows/npm-install.png new file mode 100644 index 00000000..04f9fc57 Binary files /dev/null and b/docs/assets/images/windows/npm-install.png differ diff --git a/docs/assets/images/windows/npm-run.png b/docs/assets/images/windows/npm-run.png new file mode 100644 index 00000000..e7db422e Binary files /dev/null and b/docs/assets/images/windows/npm-run.png differ diff --git a/docs/assets/images/windows/zip-download.png b/docs/assets/images/windows/zip-download.png new file mode 100644 index 00000000..3c4595c3 Binary files /dev/null and b/docs/assets/images/windows/zip-download.png differ diff --git a/docs/documentation_routes.js b/docs/documentation_routes.js index 6f83c3d5..1f0a787c 100644 --- a/docs/documentation_routes.js +++ b/docs/documentation_routes.js @@ -7,14 +7,27 @@ router.get('/', function(req , res){ res.render('index'); }); +// Install routing +router.post('/install', function (req, res) { + let install = req.body.install; + + if (install === 'Simple') { + res.redirect('/docs/install/simple') + } if (install === 'Developer') { + res.redirect('/docs/install/advanced') + } else { + res.redirect('/docs/install/download-zip') + } +}); + // Mac or Windows install router.post('/install/mac', function (req, res) { let machine = req.body.machine; if (machine === 'Mac') { - res.redirect('/docs/install/mac/requirements') + res.redirect('/docs/install/mac/terminal') } else { - res.redirect('/docs/install/windows/requirements') + res.redirect('/docs/install/windows/terminal') } }); diff --git a/docs/views/about.html b/docs/views/about.html index e42705c5..26f18bd5 100755 --- a/docs/views/about.html +++ b/docs/views/about.html @@ -1,7 +1,7 @@ {% extends 'layouts/layout.html' %} {% block pageTitle %} - NHS.UK prototype kit - About + About - NHS.UK prototype kit {% endblock %} {% block beforeContent %} diff --git a/docs/views/install/advanced.html b/docs/views/install/advanced.html index eb21c78d..a262402e 100644 --- a/docs/views/install/advanced.html +++ b/docs/views/install/advanced.html @@ -1,7 +1,7 @@ {% extends 'layouts/layout.html' %} {% block pageTitle %} - NHS.UK prototype kit - Advanced install + Developer friendly install guide - NHS.UK prototype kit {% endblock %} {% block beforeContent %} @@ -22,7 +22,7 @@
-

Advanced install guide

+

Developer friendly install guide

The prototype kit is built on the Expressopens in new window framework, and uses the NHS.UK frontendopens in new window.

diff --git a/docs/views/install/check-it-works.html b/docs/views/install/check-it-works.html index 44919063..480bf588 100644 --- a/docs/views/install/check-it-works.html +++ b/docs/views/install/check-it-works.html @@ -1,7 +1,7 @@ {% extends 'layouts/layout.html' %} {% block pageTitle %} - NHS.UK prototype kit - Check it works + Check it works - NHS.UK prototype kit {% endblock %} {% block beforeContent %} @@ -23,9 +23,11 @@

- Step 10 of 10 + Step 8 of 8 Check it works

+ +

Check your local host

In your web browser, visit http://localhost:3000 opens in a new tab

@@ -33,28 +35,33 @@

Screenshot of the prototype kit welcome page -

Quitting the kit

+
+ + + I don't see that page + + +
+

If you don't see that page

-

Sometimes you need to stop the kit running to use things like Git or Heroku. You can learn about Git and Heroku in the How to guides.

- -

It’s okay to leave the kit running for days or while your computer is asleep.

+ {% block branchingContent %} + {% endblock %} -

To quit the kit

+ Screenshot of the terminal running the kit - {% block branchingContent %} - {% endblock %} +

Make sure the number in the terminal matches the one in the web address.

+ +

The kit automatically changes to http://localhost:3001 if http://localhost:3000 is already in use.

+
+

Installation complete

The kit is now installed. Congratulations!

-
- -

Get started

- -

Start making pages

+

Getting going

-
+

Start making pages

{% block pagination %} {% endblock %} diff --git a/docs/views/install/download-zip.html b/docs/views/install/download-zip.html new file mode 100644 index 00000000..565f9030 --- /dev/null +++ b/docs/views/install/download-zip.html @@ -0,0 +1,47 @@ +{% extends 'layouts/layout.html' %} + +{% block pageTitle %} + NHS.UK prototype kit - Download the kit +{% endblock %} + +{% block beforeContent %} + {{ breadcrumb({ + items: [ + { + href: "/docs", + text: "Home" + } + ], + href: "/docs/install", + text: "Install" + }) }} +{% endblock %} + +{% block content %} +
+ +
+ +

+ Download the kit +

+ +

Zip file

+ +

The simplest way to get the kit is to download it as a zip.

+ +

GitHub

+ +

You can also clone or download a copy from GitHub

+ + {{ backLink({ + "href": "/docs/install", + "text": "Back to Installing the kit", + "classes": "nhsuk-u-margin-top-6" + }) }} + + +
+ +
+{% endblock %} diff --git a/docs/views/install/download.html b/docs/views/install/download.html index a1c37bbd..19a63ebc 100644 --- a/docs/views/install/download.html +++ b/docs/views/install/download.html @@ -1,7 +1,7 @@ {% extends 'layouts/layout.html' %} {% block pageTitle %} - NHS.UK prototype kit - Install + Download and decide where to keep your prototypes - NHS.UK prototype kit {% endblock %} {% block beforeContent %} @@ -23,14 +23,46 @@

- Step 5 of 10 - Download the kit + Step 4 of 8 + Download and decide where to keep your prototypes

-

The simplest way to get the kit is to download it as a zip.

+

1. Create a folder

+ + {% block branchingContent %} + {% endblock %} + +

2. Download the kit

+ +

The simplest way to get the kit is to download it as a zip.

You'll use a new copy of the kit for each new prototype you make. That way your prototypes don’t interfere with each other.

+

3. Unzip the kit

+ +

Unzip the kit you downloaded - you should end up with a folder called nhsuk-prototype-kit-master.

+ + {% block branchingContentTwo %} + {% endblock %} + +

4. Rename the folder

+ +

Rename the folder to something descriptive for your prototype.

+ +

For this guide, call the folder:

+ +

find-a-pharmacy

+ + {% block branchingContentThree %} + {% endblock %} + +

5. Move the folder

+ +

Move the folder into your Projects folder.

+ + {% block branchingContentFour %} + {% endblock %} + {% block pagination %} {% endblock %} diff --git a/docs/views/install/index.html b/docs/views/install/index.html index ed122846..37be943f 100755 --- a/docs/views/install/index.html +++ b/docs/views/install/index.html @@ -1,7 +1,7 @@ {% extends 'layouts/layout.html' %} {% block pageTitle %} - NHS.UK prototype kit - Install + How do you want to install the kit? - NHS.UK prototype kit {% endblock %} {% block beforeContent %} @@ -14,32 +14,51 @@ {% block content %}
-
+
-

- Installing the kit -

+
-

Install guide

+
+ +

+ Install the kit +

+ + Using the: +
+
+
+ + +
+
+ + +
+
or
+
+ + +
+
+
+
-

Install the kit in 10 steps.

- -

You don’t need any technical knowledge to follow along.

+ {{ button({ + "text": "Continue" + }) }} -

Installation takes up to 20 minutes depending on how much you need to install.

- -

Install guide

- -

Developer friendly install guide

- -

For users familiar with Node.js, Git and the terminal.

- -

Developer friendly install guide

+
{{ backLink({ "href": "/docs", - "text": "Back to Home", - "classes": "nhsuk-u-margin-top-7" + "text": "Back to Home" }) }}
diff --git a/docs/views/install/mac-or-windows.html b/docs/views/install/mac-or-windows.html index 8db1100f..773f3f80 100644 --- a/docs/views/install/mac-or-windows.html +++ b/docs/views/install/mac-or-windows.html @@ -1,7 +1,7 @@ {% extends 'layouts/layout.html' %} {% block pageTitle %} - NHS.UK prototype kit - Node + Mac or Windows - NHS.UK prototype kit {% endblock %} {% block beforeContent %} @@ -26,7 +26,7 @@ {% call fieldset({ legend: { - text: "Are you installing on a Mac or a Windows machine?", + text: "What computer are you using?", classes: "nhsuk-fieldset__legend--l", isPageHeading: true } diff --git a/docs/views/install/mac/check-it-works.html b/docs/views/install/mac/check-it-works.html index 98c73cb0..e2f8a51d 100644 --- a/docs/views/install/mac/check-it-works.html +++ b/docs/views/install/mac/check-it-works.html @@ -1,14 +1,12 @@ {% extends "install/check-it-works.html" %} {% block branchingContent %} -

In the terminal press the ctrl and c keys together.

+

Check the localhost number in the terminal:

{% endblock %} {% block pagination %} - {{ pagination({ "previousUrl": "/docs/install/mac/run", - "previousPage": "Run the kit" + "previousPage": "Step 7: Run the kit" }) }} - {% endblock %} diff --git a/docs/views/install/mac/download.html b/docs/views/install/mac/download.html index 65a08e58..e1547ae9 100644 --- a/docs/views/install/mac/download.html +++ b/docs/views/install/mac/download.html @@ -1,10 +1,30 @@ {% extends "install/download.html" %} +{% block branchingContent %} +

Create a folder called Projects in your home folder.

+ +

You can open your home folder by opening a new finder window and selecting Go > Home from the top menu.

+ + Screenshot of projects folder +{% endblock %} + +{% block branchingContentTwo %} + Screenshot of the downloaded zip file +{% endblock %} + +{% block branchingContentThree %} + Screenshot of the renamed folder +{% endblock %} + +{% block branchingContentFour %} + Screenshot of the projects folder +{% endblock %} + {% block pagination %} {{ pagination({ "previousUrl": "/docs/install/mac/text-editor", - "previousPage": "Text editor", - "nextUrl": "/docs/install/mac/where-to-keep", - "nextPage": "Where to keep your prototypes" + "previousPage": "Step 3: HTML text editor", + "nextUrl": "/docs/install/mac/open", + "nextPage": "Step 5: Go to your prototype" }) }} {% endblock %} diff --git a/docs/views/install/mac/node.html b/docs/views/install/mac/node.html index dfc5a997..1e8827ec 100644 --- a/docs/views/install/mac/node.html +++ b/docs/views/install/mac/node.html @@ -12,6 +12,10 @@ Screenshot of checking Node version {% endblock %} +{% block branchingLink %} + step 3 +{% endblock %} + {% block branchingImageTwo %} Screenshot of displaying Node version 8 {% endblock %} @@ -19,8 +23,8 @@ {% block pagination %} {{ pagination({ "previousUrl": "/docs/install/mac/terminal", - "previousPage": "Terminal", + "previousPage": "Step 1: Terminal", "nextUrl": "/docs/install/mac/text-editor", - "nextPage": "Text editor" + "nextPage": "Step 3: HTML text editor" }) }} {% endblock %} diff --git a/docs/views/install/mac/open.html b/docs/views/install/mac/open.html index 311d6ac5..bf6f8e27 100644 --- a/docs/views/install/mac/open.html +++ b/docs/views/install/mac/open.html @@ -9,15 +9,15 @@ {% endblock %} {% block branchingLink %} - step 6 + step 4 {% endblock %} {% block pagination %} {{ pagination({ - "previousUrl": "/docs/install/mac/where-to-keep", - "previousPage": "Where to keep your prototypes", - "nextUrl": "/docs/install/mac/npm", - "nextPage": "Install kit" + "previousUrl": "/docs/install/mac/download", + "previousPage": "Step 4: Download the kit", + "nextUrl": "/docs/install/mac/setup", + "nextPage": "Step 6: Setup the kit" }) }} {% endblock %} diff --git a/docs/views/install/mac/requirements.html b/docs/views/install/mac/requirements.html deleted file mode 100644 index cf82f964..00000000 --- a/docs/views/install/mac/requirements.html +++ /dev/null @@ -1,10 +0,0 @@ -{% extends "install/requirements.html" %} - -{% block pagination %} - {{ pagination({ - "previousUrl": "/docs/install/mac-or-windows", - "previousPage": "Mac or Windows", - "nextUrl": "/docs/install/mac/terminal", - "nextPage": "Terminal" - }) }} -{% endblock %} diff --git a/docs/views/install/mac/run.html b/docs/views/install/mac/run.html index 3d2950ac..6dac251d 100644 --- a/docs/views/install/mac/run.html +++ b/docs/views/install/mac/run.html @@ -12,9 +12,9 @@ {% block pagination %} {{ pagination({ - "previousUrl": "/docs/install/mac/npm", - "previousPage": "Install kit", + "previousUrl": "/docs/install/mac/setup", + "previousPage": "Step 6: Setup the kit", "nextUrl": "/docs/install/mac/check-it-works", - "nextPage": "Check it works" + "nextPage": "Step 8: Check it works" }) }} {% endblock %} diff --git a/docs/views/install/mac/npm.html b/docs/views/install/mac/setup.html similarity index 76% rename from docs/views/install/mac/npm.html rename to docs/views/install/mac/setup.html index b23303e3..73a0ec92 100644 --- a/docs/views/install/mac/npm.html +++ b/docs/views/install/mac/setup.html @@ -1,4 +1,4 @@ -{% extends "install/npm.html" %} +{% extends "install/setup.html" %} {% block branchingContent %}

Enter in terminal:

@@ -11,8 +11,8 @@ {% block pagination %} {{ pagination({ "previousUrl": "/docs/install/mac/open", - "previousPage": "Open your prototype", + "previousPage": "Step 5: Got to your prototype", "nextUrl": "/docs/install/mac/run", - "nextPage": "Run the kit" + "nextPage": "Step 7: Run the kit" }) }} {% endblock %} diff --git a/docs/views/install/mac/terminal.html b/docs/views/install/mac/terminal.html index e73397d9..d31f16a3 100644 --- a/docs/views/install/mac/terminal.html +++ b/docs/views/install/mac/terminal.html @@ -4,18 +4,24 @@ {% endblock %} {% block branchingContent %} -

Macs come with Terminal.app. It’s located in the Utilities folder in the Applications folder. +

The first thing you need to do is open the Terminal.app on your Mac.

-

You can also find it using spotlight (magnifying glass icon in the top right) and typing 'terminal'.

+

You'll use the terminal application to install, start and stop the kit.

+ +

It’s located in the Utilities folder in the Applications folder.

+ + Screenshot of the location of the terminal application + +

It will look similar to this:

Screenshot of the terminal {% endblock %} {% block pagination %} {{ pagination({ - "previousUrl": "/docs/install/mac/requirements", - "previousPage": "Requirements", + "previousUrl": "/docs/install/mac-or-windows", + "previousPage": "Mac or Windows", "nextUrl": "/docs/install/mac/node", - "nextPage": "Install Node.js" + "nextPage": "Step 2: Install Node.js" }) }} {% endblock %} diff --git a/docs/views/install/mac/text-editor.html b/docs/views/install/mac/text-editor.html index 805fa446..e192c5c0 100644 --- a/docs/views/install/mac/text-editor.html +++ b/docs/views/install/mac/text-editor.html @@ -3,8 +3,8 @@ {% block pagination %} {{ pagination({ "previousUrl": "/docs/install/mac/node", - "previousPage": "Install Node.js", + "previousPage": "Step 2: Install Node.js", "nextUrl": "/docs/install/mac/download", - "nextPage": "Download the kit" + "nextPage": "Step 4: Download the kit" }) }} {% endblock %} diff --git a/docs/views/install/mac/where-to-keep.html b/docs/views/install/mac/where-to-keep.html deleted file mode 100644 index 4e630937..00000000 --- a/docs/views/install/mac/where-to-keep.html +++ /dev/null @@ -1,20 +0,0 @@ -{% extends "install/where-to-keep.html" %} - -{% block branchingContent %} -

Create a folder

- -

Create a folder called projects in your home folder.

- -

You can open your home folder by opening a new finder window and selecting Go > Home from the top menu.

- - Screenshot of projects folder -{% endblock %} - -{% block pagination %} - {{ pagination({ - "previousUrl": "/docs/install/mac/download", - "previousPage": "Download the kit", - "nextUrl": "/docs/install/mac/open", - "nextPage": "Navigate to your prototype" - }) }} -{% endblock %} diff --git a/docs/views/install/node.html b/docs/views/install/node.html index e8c1d781..5145ad6f 100644 --- a/docs/views/install/node.html +++ b/docs/views/install/node.html @@ -1,7 +1,7 @@ {% extends 'layouts/layout.html' %} {% block pageTitle %} - NHS.UK prototype kit - Node + Install Node - NHS.UK prototype kit {% endblock %} {% block beforeContent %} @@ -23,14 +23,17 @@

- Step 3 of 10 - Node.js + Step 2 of 8 + Node.js LTS version

-

Node.js is nothing scary; it's just some software needed for the kit, that runs in the background. Node.js is very easy to install.

+

Node.js is nothing scary; it's just some software needed for the kit.

+ +

Node.js is very easy to install.

+

The kit is designed to work with Node.js LTS (Long Term Support) version 8 or higher.

-

Check if you have Node

+

1. Check if you have Node

{% block branchingContent %} {% endblock %} @@ -40,23 +43,33 @@

Check if you have Node

{% block branchingImage %} {% endblock %} -

If it says command not found or Error 0x2 starting node.exe --version you don’t have node and will need to download and install it.

- -

If the version number starts with an 8 or higher, you have the correct version installed.

+

If it says:

+ +
    +
  • command not found
    • +
  • Error 0x2 starting node.exe --version
    • +
  • or another number such as 0.12 or 5.x.x
    • +
+ +

Then you will need to download and install the LTS version 8 or higher.

-

If it says another number such as 0.12 or 5.x.x, you need to download and install version 8 or higher.

+

If the version number starts with an 8 or higher

+ +

You have the correct version installed and can go to {% block branchingLink %}{% endblock %}.

-

Download and install Node.js

+

2. Download and install Node.js LTS version

-

Download the LTS version 8 or higher and run the installer with all default options.

+

Download the LTS version 8 or higher.

+ +

Run the installer with all default options.

Download and install Node.js (opens in new window).

-

Once Node is installed

+

3. Check if Node is installed properly

You’ll need to quit and restart {% block branchingTerminal %}{% endblock %} to be able to use Node for the first time.

-

To check it is installed correctly you can again run:

+

To check it is installed correctly you can run:

node --version
diff --git a/docs/views/install/open.html b/docs/views/install/open.html index 701aacf2..4501ca6d 100644 --- a/docs/views/install/open.html +++ b/docs/views/install/open.html @@ -1,7 +1,7 @@ {% extends 'layouts/layout.html' %} {% block pageTitle %} - NHS.UK prototype kit - Navigate to your prototype + Go to your prototype- NHS.UK prototype kit {% endblock %} {% block beforeContent %} @@ -23,15 +23,17 @@

- Step 7 of 10 + Step 5 of 8 Go to your prototype

+
+

Make sure your prototype folder has the same name and location as in {% block branchingLink %}{% endblock %}.

+
+ {% block branchingContent %} {% endblock %} -

Please note: For the command above to work, ensure your prototype folder has the same name and location as in {% block branchingLink %}{% endblock %}.

- {% block pagination %} {% endblock %} diff --git a/docs/views/install/requirements.html b/docs/views/install/requirements.html index 7c10dc61..86082b0b 100644 --- a/docs/views/install/requirements.html +++ b/docs/views/install/requirements.html @@ -1,7 +1,7 @@ {% extends 'layouts/layout.html' %} {% block pageTitle %} - NHS.UK prototype kit - Install + Install - NHS.UK prototype kit {% endblock %} {% block beforeContent %} diff --git a/docs/views/install/run.html b/docs/views/install/run.html index 5c9343be..87b4cf8f 100644 --- a/docs/views/install/run.html +++ b/docs/views/install/run.html @@ -1,7 +1,7 @@ {% extends 'layouts/layout.html' %} {% block pageTitle %} - NHS.UK prototype kit - Install + Run the kit - NHS.UK prototype kit {% endblock %} {% block beforeContent %} @@ -23,7 +23,7 @@

- Step 9 of 10 + Step 7 of 8 Run the kit

@@ -34,8 +34,6 @@

After the kit has started, you should see a message telling you that the kit is running:

- 
-----------------------------------
Local: http://localhost:3000
External: http://172.17.241.10:3000
-----------------------------------
[Browsersync] Watching files...
[15:45:12] Finished 'startBrowserSync' after 167 ms
- {% block branchingImage %} {% endblock %} diff --git a/docs/views/install/npm.html b/docs/views/install/setup.html similarity index 81% rename from docs/views/install/npm.html rename to docs/views/install/setup.html index e11b8a26..004dd6af 100644 --- a/docs/views/install/npm.html +++ b/docs/views/install/setup.html @@ -1,7 +1,7 @@ {% extends 'layouts/layout.html' %} {% block pageTitle %} - NHS.UK prototype kit - Install + Setup the kit - NHS.UK prototype kit {% endblock %} {% block beforeContent %} @@ -23,11 +23,9 @@

- Step 8 of 10 - Install kit + Step 6 of 8 + Setup the kit

- -

Before you can run the kit, you need to download some extra code.

{% block branchingContent %} {% endblock %} diff --git a/docs/views/install/simple.html b/docs/views/install/simple.html index e4f2a5a1..5430ac2c 100644 --- a/docs/views/install/simple.html +++ b/docs/views/install/simple.html @@ -1,7 +1,7 @@ {% extends 'layouts/layout.html' %} {% block pageTitle %} - NHS.UK prototype kit - Introduction + Install guide - NHS.UK prototype kit {% endblock %} {% block beforeContent %} @@ -26,12 +26,16 @@

Install guide

-

These instructions explain how to install and begin to use the kit in 10 steps. You don’t need any technical knowledge to follow along.

- -

If you have any problems, ask a developer on your team (if you have one), email us or get in touch on the NHS.UK #prototype-kit Slack channel.

+

To start making prototypes you need to setup the right tools to make the kit work.

+ +

This guide will show you how to get setup in 8 steps.

+

You don’t need any technical knowledge to follow along.

+

Installation takes up to 20 minutes depending on how much you need to install.

+

If you have any problems, ask a developer on your team (if you have one), email us or get in touch on the NHS.UK #prototype-kit Slack channel.

+

If you are familiar with using git and the terminal, then you might prefer the developer friendly guide.

@@ -40,10 +44,9 @@

{{ backLink({ "href": "/docs/install", - "text": "Back to Installation overview" + "text": "Back to Installing the kit" }) }} -

diff --git a/docs/views/install/terminal.html b/docs/views/install/terminal.html index 54ddf6ea..ed5243c3 100644 --- a/docs/views/install/terminal.html +++ b/docs/views/install/terminal.html @@ -1,7 +1,7 @@ {% extends 'layouts/layout.html' %} {% block pageTitle %} - NHS.UK prototype kit - Terminal + Terminal - NHS.UK prototype kit {% endblock %} {% block beforeContent %} @@ -23,15 +23,15 @@

- Step 2 of 10 + Step 1 of 8 {% block branchingHeader %}Terminal{% endblock %}

-

You'll need a terminal application to install, start and stop the kit. Using a terminal is sometimes called ‘using the command line’.

- {% block branchingContent %} {% endblock %} +

Once you have it open, keep it open and go to step 2.

+ {% block pagination %} {% endblock %} diff --git a/docs/views/install/text-editor.html b/docs/views/install/text-editor.html index abb630e7..4ea9a6fd 100644 --- a/docs/views/install/text-editor.html +++ b/docs/views/install/text-editor.html @@ -1,7 +1,7 @@ {% extends 'layouts/layout.html' %} {% block pageTitle %} - NHS.UK prototype kit - Text editor + HTML text editor - NHS.UK prototype kit {% endblock %} {% block beforeContent %} @@ -23,17 +23,17 @@

- Step 4 of 10 + Step 3 of 8 HTML text editor

-

You’ll need a text editor to edit and make changes to your prototype.

+

You’ll need a HTML text editor to edit and make changes to your prototype.

-

Any text editor will do, but we recommend Atom - which is free and has lots of useful features.

+

Any HTML text editor will do, but we recommend Atom - which is free and has lots of useful features.

Download Atom (opens in new window)

-

Once you have a text editor installed, return to this guide.

+

Once you have a HTML text editor installed, return to this guide.

{% block pagination %} {% endblock %} diff --git a/docs/views/install/where-to-keep.html b/docs/views/install/where-to-keep.html index 69828b23..f214adf9 100644 --- a/docs/views/install/where-to-keep.html +++ b/docs/views/install/where-to-keep.html @@ -1,7 +1,7 @@ {% extends 'layouts/layout.html' %} {% block pageTitle %} - NHS.UK prototype kit - Install + Install - NHS.UK prototype kit {% endblock %} {% block beforeContent %} diff --git a/docs/views/install/windows/check-it-works.html b/docs/views/install/windows/check-it-works.html index e45476ff..5bb7c7af 100644 --- a/docs/views/install/windows/check-it-works.html +++ b/docs/views/install/windows/check-it-works.html @@ -1,12 +1,12 @@ {% extends "install/check-it-works.html" %} {% block branchingContent %} -

In git bash press the ctrl and c keys together.

+

Check the localhost number in the Command Prompt:

{% endblock %} {% block pagination %} {{ pagination({ "previousUrl": "/docs/install/windows/run", - "previousPage": "Run the kit" + "previousPage": "Step 7: Run the kit" }) }} {% endblock %} diff --git a/docs/views/install/windows/download.html b/docs/views/install/windows/download.html index 9ac9b9fc..bbf1ac6c 100644 --- a/docs/views/install/windows/download.html +++ b/docs/views/install/windows/download.html @@ -1,10 +1,32 @@ {% extends "install/download.html" %} +{% block branchingContent %} +

Create a folder called projects in your Documents folder.

+ + Screenshot of projects folder +{% endblock %} + +{% block branchingContentTwo %} + Screenshot of the downloaded zip file + +

Open that folder by double clicking on it. You should then see another folder named nhsuk-prototype-kit-master.

+ + Screenshot of the downloaded zip file +{% endblock %} + +{% block branchingContentThree %} + Screenshot of the renamed folder +{% endblock %} + +{% block branchingContentFour %} + Screenshot of the projects folder +{% endblock %} + {% block pagination %} {{ pagination({ "previousUrl": "/docs/install/windows/text-editor", - "previousPage": "Text editor", - "nextUrl": "/docs/install/windows/where-to-keep", - "nextPage": "Where to keep your prototypes" + "previousPage": "Step 3: HTML text editor", + "nextUrl": "/docs/install/windows/open", + "nextPage": "Step 5: Go to your prototype" }) }} {% endblock %} diff --git a/docs/views/install/windows/git-bash.html b/docs/views/install/windows/git-bash.html index 4de2277a..4d19efa8 100644 --- a/docs/views/install/windows/git-bash.html +++ b/docs/views/install/windows/git-bash.html @@ -1,7 +1,7 @@ {% extends "install/terminal.html" %} {% block pageTitle %} - NHS.UK prototype kit - Git bash + Git bash - NHS.UK prototype kit {% endblock %} {% block branchingHeader %} diff --git a/docs/views/install/windows/node.html b/docs/views/install/windows/node.html index c4254c4a..a7f505d6 100644 --- a/docs/views/install/windows/node.html +++ b/docs/views/install/windows/node.html @@ -1,24 +1,30 @@ {% extends "install/node.html" %} {% block branchingContent %} -

In git bash enter:

+

In the Command Prompt enter:

{% endblock %} {% block branchingTerminal %} - git bash + the Command Prompt {% endblock %} {% block branchingImage %} + Screenshot of checking Node version +{% endblock %} + +{% block branchingLink %} + step 3 {% endblock %} {% block branchingImageTwo %} + Screenshot of displaying Node version 8 {% endblock %} {% block pagination %} {{ pagination({ - "previousUrl": "/docs/install/windows/git-bash", - "previousPage": "Git bash", + "previousUrl": "/docs/install/windows/terminal", + "previousPage": "Step 1: Terminal", "nextUrl": "/docs/install/windows/text-editor", - "nextPage": "Text editor" + "nextPage": "Step 3: HTML text editor" }) }} {% endblock %} diff --git a/docs/views/install/windows/npm.html b/docs/views/install/windows/npm.html deleted file mode 100644 index 90476c3c..00000000 --- a/docs/views/install/windows/npm.html +++ /dev/null @@ -1,14 +0,0 @@ -{% extends "install/npm.html" %} - -{% block branchingContent %} -

Enter in git bash:

-{% endblock %} - -{% block pagination %} - {{ pagination({ - "previousUrl": "/docs/install/windows/open", - "previousPage": "Open your prototype", - "nextUrl": "/docs/install/windows/run", - "nextPage": "Run the kit" - }) }} -{% endblock %} diff --git a/docs/views/install/windows/open.html b/docs/views/install/windows/open.html index 5803da98..4941775a 100644 --- a/docs/views/install/windows/open.html +++ b/docs/views/install/windows/open.html @@ -1,21 +1,23 @@ {% extends "install/open.html" %} {% block branchingContent %} -

You need to navigate to your prototype in the git bash.

+

Go to your prototype by entering in the Command Prompt:

- 
cd ~/Documents/projects/find-a-pharmacy
+ 
cd Documents/Projects/find-a-pharmacy
+ + Screenshot of navigating to project in the command prompt {% endblock %} {% block branchingLink %} - step 6 + step 4 {% endblock %} + {% block pagination %} {{ pagination({ - "previousUrl": "/docs/install/windows/where-to-keep", - "previousPage": "Where to keep your prototypes", - "nextUrl": "/docs/install/windows/npm", - "nextPage": "Install kit" + "previousUrl": "/docs/install/windows/download", + "previousPage": "Step 4: Download the kit", + "nextUrl": "/docs/install/windows/setup", + "nextPage": "Step 6: Setup the kit" }) }} - {% endblock %} diff --git a/docs/views/install/windows/requirements.html b/docs/views/install/windows/requirements.html deleted file mode 100644 index 7093e906..00000000 --- a/docs/views/install/windows/requirements.html +++ /dev/null @@ -1,14 +0,0 @@ -{% extends "install/requirements.html" %} - -{% block branchingContent %} -
  • Git bash
    • -{% endblock %} - -{% block pagination %} - {{ pagination({ - "previousUrl": "/docs/install/mac-or-windows", - "previousPage": "Mac or Windows", - "nextUrl": "/docs/install/windows/git-bash", - "nextPage": "Git bash" - }) }} -{% endblock %} diff --git a/docs/views/install/windows/run.html b/docs/views/install/windows/run.html index d0b13ee1..3134c3ee 100644 --- a/docs/views/install/windows/run.html +++ b/docs/views/install/windows/run.html @@ -1,19 +1,20 @@ {% extends "install/run.html" %} {% block branchingContent %} -

    You’ll use git bash to start and stop the kit.

    +

    You’ll use the Command Prompt to start and stop the kit.

    -

    Start your local server by entering in git bash:

    +

    Start your local server by entering in the Command Prompt:

    {% endblock %} {% block branchingImage %} + Screenshot of npm run watch {% endblock %} {% block pagination %} {{ pagination({ - "previousUrl": "/docs/install/windows/npm", - "previousPage": "Install kit", + "previousUrl": "/docs/install/windows/setup", + "previousPage": "Step 6: Setup the kit", "nextUrl": "/docs/install/windows/check-it-works", - "nextPage": "Check it works" + "nextPage": "Step 8: Check it works" }) }} {% endblock %} diff --git a/docs/views/install/windows/setup.html b/docs/views/install/windows/setup.html new file mode 100644 index 00000000..ae0fd6f2 --- /dev/null +++ b/docs/views/install/windows/setup.html @@ -0,0 +1,18 @@ +{% extends "install/setup.html" %} + +{% block branchingContent %} +

    Enter in the Command Prompt:

    +{% endblock %} + +{% block branchingImage %} + Screenshot of installing npm modules +{% endblock %} + +{% block pagination %} + {{ pagination({ + "previousUrl": "/docs/install/windows/open", + "previousPage": "Step 5: Got to your prototype", + "nextUrl": "/docs/install/windows/run", + "nextPage": "Step 7: Run the kit" + }) }} +{% endblock %} diff --git a/docs/views/install/windows/terminal.html b/docs/views/install/windows/terminal.html new file mode 100644 index 00000000..b46ad3d9 --- /dev/null +++ b/docs/views/install/windows/terminal.html @@ -0,0 +1,32 @@ +{% extends "install/terminal.html" %} + +{% block pageTitle %} + NHS.UK prototype kit - Command Prompt +{% endblock %} + +{% block branchingContent %} +

    The first thing you need to do is open the Command Prompt on your Windows machine.

    + +

    You'll use the Command Prompt to install, start and stop the kit.

    + +

    To open the Command Prompt:

    +
      +
    • Click Start
      • +
    • In the Search, type cmd (short for command) or commandprompt, and press Enter.
      • +
    + + Screenshot of the location of the command prompt + +

    It will look similar to this:

    + + Screenshot of the command prompt +{% endblock %} + +{% block pagination %} + {{ pagination({ + "previousUrl": "/docs/install/mac-or-windows", + "previousPage": "Mac or Windows", + "nextUrl": "/docs/install/windows/node", + "nextPage": "Step 2: Install Node.js" + }) }} +{% endblock %} diff --git a/docs/views/install/windows/text-editor.html b/docs/views/install/windows/text-editor.html index 37cb42cf..becc53c2 100644 --- a/docs/views/install/windows/text-editor.html +++ b/docs/views/install/windows/text-editor.html @@ -3,8 +3,8 @@ {% block pagination %} {{ pagination({ "previousUrl": "/docs/install/windows/node", - "previousPage": "Install Node.js", + "previousPage": "Step 2: Install Node.js", "nextUrl": "/docs/install/windows/download", - "nextPage": "Download the kit" + "nextPage": "Step 4: Download the kit" }) }} {% endblock %} diff --git a/docs/views/install/windows/where-to-keep.html b/docs/views/install/windows/where-to-keep.html deleted file mode 100644 index 18b2ce23..00000000 --- a/docs/views/install/windows/where-to-keep.html +++ /dev/null @@ -1,16 +0,0 @@ -{% extends "install/where-to-keep.html" %} - -{% block branchingContent %} -

    Create a folder

    - -

    Create a folder called projects in your Documents folder.

    -{% endblock %} - -{% block pagination %} - {{ pagination({ - "previousUrl": "/docs/install/windows/download", - "previousPage": "Download the kit", - "nextUrl": "/docs/install/windows/open", - "nextPage": "Navigate to your prototype" - }) }} -{% endblock %} diff --git a/docs/views/layouts/layout-nhsuk.html b/docs/views/layouts/layout-nhsuk.html index 10104c09..1d2642c1 100755 --- a/docs/views/layouts/layout-nhsuk.html +++ b/docs/views/layouts/layout-nhsuk.html @@ -5,7 +5,7 @@ {% block pageTitle %} - NHS.UK prototype kit - NHS.UK page layout + NHS.UK page layout - NHS.UK prototype kit {% endblock %} diff --git a/package-lock.json b/package-lock.json index 6ab72b45..bec455a5 100755 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "nhsuk-prototype-kit", - "version": "0.0.1", + "version": "1.0.0", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -38,21 +38,21 @@ } }, "@babel/core": { - "version": "7.2.2", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.2.2.tgz", - "integrity": "sha512-59vB0RWt09cAct5EIe58+NzGP4TFSD3Bz//2/ELy3ZeTeKF6VTD1AXlH8BGGbCX0PuobZBsIzO7IAI9PH67eKw==", + "version": "7.3.3", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.3.3.tgz", + "integrity": "sha512-w445QGI2qd0E0GlSnq6huRZWPMmQGCp5gd5ZWS4hagn0EiwzxD5QMFkpchyusAyVC1n27OKXzQ0/88aVU9n4xQ==", "requires": { "@babel/code-frame": "^7.0.0", - "@babel/generator": "^7.2.2", + "@babel/generator": "^7.3.3", "@babel/helpers": "^7.2.0", - "@babel/parser": "^7.2.2", + "@babel/parser": "^7.3.3", "@babel/template": "^7.2.2", "@babel/traverse": "^7.2.2", - "@babel/types": "^7.2.2", + "@babel/types": "^7.3.3", "convert-source-map": "^1.1.0", "debug": "^4.1.0", "json5": "^2.1.0", - "lodash": "^4.17.10", + "lodash": "^4.17.11", "resolve": "^1.3.2", "semver": "^5.4.1", "source-map": "^0.5.0" @@ -74,13 +74,13 @@ } }, "@babel/generator": { - "version": "7.2.2", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.2.2.tgz", - "integrity": "sha512-I4o675J/iS8k+P38dvJ3IBGqObLXyQLTxtrR4u9cSUJOURvafeEWb/pFMOTwtNrmq73mJzyF6ueTbO1BtN0Zeg==", + "version": "7.3.3", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.3.3.tgz", + "integrity": "sha512-aEADYwRRZjJyMnKN7llGIlircxTCofm3dtV5pmY6ob18MSIuipHpA2yZWkPlycwu5HJcx/pADS3zssd8eY7/6A==", "requires": { - "@babel/types": "^7.2.2", + "@babel/types": "^7.3.3", "jsesc": "^2.5.1", - "lodash": "^4.17.10", + "lodash": "^4.17.11", "source-map": "^0.5.0", "trim-right": "^1.0.1" } @@ -259,13 +259,13 @@ } }, "@babel/helpers": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.2.0.tgz", - "integrity": "sha512-Fr07N+ea0dMcMN8nFpuK6dUIT7/ivt9yKQdEEnjVS83tG2pHwPi03gYmk/tyuwONnZ+sY+GFFPlWGgCtW1hF9A==", + "version": "7.3.1", + "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.3.1.tgz", + "integrity": "sha512-Q82R3jKsVpUV99mgX50gOPCWwco9Ec5Iln/8Vyu4osNIOQgSrd9RFrQeUvmvddFNoLwMyOUWU+5ckioEKpDoGA==", "requires": { "@babel/template": "^7.1.2", "@babel/traverse": "^7.1.5", - "@babel/types": "^7.2.0" + "@babel/types": "^7.3.0" } }, "@babel/highlight": { @@ -279,9 +279,9 @@ } }, "@babel/parser": { - "version": "7.2.3", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.2.3.tgz", - "integrity": "sha512-0LyEcVlfCoFmci8mXx8A5oIkpkOgyo8dRHtxBnK9RRBwxO2+JZPNsqtVEZQ7mJFPxnXF9lfmU24mHOPI0qnlkA==" + "version": "7.3.3", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.3.3.tgz", + "integrity": "sha512-xsH1CJoln2r74hR+y7cg2B5JCPaTh+Hd+EbBRk9nWGSNspuo6krjhX0Om6RnRQuIvFq8wVXCLKH3kwKDYhanSg==" }, "@babel/plugin-proposal-async-generator-functions": { "version": "7.2.0", @@ -303,9 +303,9 @@ } }, "@babel/plugin-proposal-object-rest-spread": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.2.0.tgz", - "integrity": "sha512-1L5mWLSvR76XYUQJXkd/EEQgjq8HHRP6lQuZTTg0VA4tTGPpGemmCdAfQIz1rzEuWAm+ecP8PyyEm30jC1eQCg==", + "version": "7.3.2", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.3.2.tgz", + "integrity": "sha512-DjeMS+J2+lpANkYLLO+m6GjoTMygYglKmRe6cDTbFv3L9i6mmiE8fe6B8MtCSLZpVXscD5kn7s6SgtHrDoBWoA==", "requires": { "@babel/helper-plugin-utils": "^7.0.0", "@babel/plugin-syntax-object-rest-spread": "^7.2.0" @@ -398,9 +398,9 @@ } }, "@babel/plugin-transform-classes": { - "version": "7.2.2", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.2.2.tgz", - "integrity": "sha512-gEZvgTy1VtcDOaQty1l10T3jQmJKlNVxLDCs+3rCVPr6nMkODLELxViq5X9l+rfxbie3XrfrMCYYY6eX3aOcOQ==", + "version": "7.3.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.3.3.tgz", + "integrity": "sha512-n0CLbsg7KOXsMF4tSTLCApNMoXk0wOPb0DYfsOO1e7SfIb9gOyfbpKI2MZ+AXfqvlfzq2qsflJ1nEns48Caf2w==", "requires": { "@babel/helper-annotate-as-pure": "^7.0.0", "@babel/helper-define-map": "^7.1.0", @@ -421,9 +421,9 @@ } }, "@babel/plugin-transform-destructuring": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.2.0.tgz", - "integrity": "sha512-coVO2Ayv7g0qdDbrNiadE4bU7lvCd9H539m2gMknyVjjMdwF/iCOM7R+E8PkntoqLkltO0rk+3axhpp/0v68VQ==", + "version": "7.3.2", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.3.2.tgz", + "integrity": "sha512-Lrj/u53Ufqxl/sGxyjsJ2XNtNuEjDyjpqdhMNh5aZ+XFOdThL46KBj27Uem4ggoezSYBxKWAil6Hu8HtwqesYw==", "requires": { "@babel/helper-plugin-utils": "^7.0.0" } @@ -517,6 +517,14 @@ "@babel/helper-plugin-utils": "^7.0.0" } }, + "@babel/plugin-transform-named-capturing-groups-regex": { + "version": "7.3.0", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.3.0.tgz", + "integrity": "sha512-NxIoNVhk9ZxS+9lSoAQ/LM0V2UEvARLttEHUrRDGKFaAxOYQcrkN/nLRE+BbbicCAvZPl7wMP0X60HsHE5DtQw==", + "requires": { + "regexp-tree": "^0.1.0" + } + }, "@babel/plugin-transform-new-target": { "version": "7.0.0", "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.0.0.tgz", @@ -535,9 +543,9 @@ } }, "@babel/plugin-transform-parameters": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.2.0.tgz", - "integrity": "sha512-kB9+hhUidIgUoBQ0MsxMewhzr8i60nMa2KgeJKQWYrqQpqcBYtnpR+JgkadZVZoaEZ/eKu9mclFaVwhRpLNSzA==", + "version": "7.3.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.3.3.tgz", + "integrity": "sha512-IrIP25VvXWu/VlBWTpsjGptpomtIkYrN/3aDp4UKm7xK6UxZY88kcJ1UwETbzHAlwN21MnNfwlar0u8y3KpiXw==", "requires": { "@babel/helper-call-delegate": "^7.1.0", "@babel/helper-get-function-arity": "^7.0.0", @@ -605,18 +613,19 @@ } }, "@babel/preset-env": { - "version": "7.2.3", - "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.2.3.tgz", - "integrity": "sha512-AuHzW7a9rbv5WXmvGaPX7wADxFkZIqKlbBh1dmZUQp4iwiPpkE/Qnrji6SC4UQCQzvWY/cpHET29eUhXS9cLPw==", + "version": "7.3.1", + "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.3.1.tgz", + "integrity": "sha512-FHKrD6Dxf30e8xgHQO0zJZpUPfVZg+Xwgz5/RdSWCbza9QLNk4Qbp40ctRoqDxml3O8RMzB1DU55SXeDG6PqHQ==", "requires": { "@babel/helper-module-imports": "^7.0.0", "@babel/helper-plugin-utils": "^7.0.0", "@babel/plugin-proposal-async-generator-functions": "^7.2.0", "@babel/plugin-proposal-json-strings": "^7.2.0", - "@babel/plugin-proposal-object-rest-spread": "^7.2.0", + "@babel/plugin-proposal-object-rest-spread": "^7.3.1", "@babel/plugin-proposal-optional-catch-binding": "^7.2.0", "@babel/plugin-proposal-unicode-property-regex": "^7.2.0", "@babel/plugin-syntax-async-generators": "^7.2.0", + "@babel/plugin-syntax-json-strings": "^7.2.0", "@babel/plugin-syntax-object-rest-spread": "^7.2.0", "@babel/plugin-syntax-optional-catch-binding": "^7.2.0", "@babel/plugin-transform-arrow-functions": "^7.2.0", @@ -636,6 +645,7 @@ "@babel/plugin-transform-modules-commonjs": "^7.2.0", "@babel/plugin-transform-modules-systemjs": "^7.2.0", "@babel/plugin-transform-modules-umd": "^7.2.0", + "@babel/plugin-transform-named-capturing-groups-regex": "^7.3.0", "@babel/plugin-transform-new-target": "^7.0.0", "@babel/plugin-transform-object-super": "^7.2.0", "@babel/plugin-transform-parameters": "^7.2.0", @@ -694,12 +704,12 @@ } }, "@babel/types": { - "version": "7.2.2", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.2.2.tgz", - "integrity": "sha512-fKCuD6UFUMkR541eDWL+2ih/xFZBXPOg/7EQFeTluMDebfqR4jrpaCjLhkWlQS4hT6nRa2PMEgXKbRB5/H2fpg==", + "version": "7.3.3", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.3.3.tgz", + "integrity": "sha512-2tACZ80Wg09UnPg5uGAOUvvInaqLk3l/IAhQzlxLQOIXacr6bMsra5SH6AWw/hIDRCSbCdHP2KzSOD+cT7TzMQ==", "requires": { "esutils": "^2.0.2", - "lodash": "^4.17.10", + "lodash": "^4.17.11", "to-fast-properties": "^2.0.0" } }, @@ -736,9 +746,9 @@ "integrity": "sha1-/ts5T58OAqqXaOcCvaI7UF+ufh8=" }, "ajv": { - "version": "6.6.2", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.6.2.tgz", - "integrity": "sha512-FBHEW6Jf5TB9MGBgUUA9XHkTbjXYfAUjY43ACMfmdMRHniyoMHjHjzD50OK8LGDWQwp4rWEsIq5kEqq7rvIM1g==", + "version": "6.9.1", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.9.1.tgz", + "integrity": "sha512-XDN92U311aINL77ieWHmqCcNlwjoP5cHXDxIxbf2MaPYuCXOHS7gHH8jktxeK5omgd52XbSTX6a4Piwd1pQmzA==", "requires": { "fast-deep-equal": "^2.0.1", "fast-json-stable-stringify": "^2.0.0", @@ -1539,12 +1549,12 @@ } }, "browserslist": { - "version": "4.3.7", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.3.7.tgz", - "integrity": "sha512-pWQv51Ynb0MNk9JGMCZ8VkM785/4MQNXiFYtPqI7EEP0TJO+/d/NqRVn1uiAN0DNbnlUSpL2sh16Kspasv3pUQ==", + "version": "4.4.1", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.4.1.tgz", + "integrity": "sha512-pEBxEXg7JwaakBXjATYw/D1YZh4QUSCX/Mnd/wnqSRPPSi1U39iDhDoKGoBUcraKdxDlrYqJxSI5nNvD+dWP2A==", "requires": { - "caniuse-lite": "^1.0.30000925", - "electron-to-chromium": "^1.3.96", + "caniuse-lite": "^1.0.30000929", + "electron-to-chromium": "^1.3.103", "node-releases": "^1.1.3" } }, @@ -1614,9 +1624,9 @@ } }, "caniuse-lite": { - "version": "1.0.30000927", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000927.tgz", - "integrity": "sha512-ogq4NbUWf1uG/j66k0AmiO3GjqJAlQyF8n4w8a954cbCyFKmYGvRtgz6qkq2fWuduTXHibX7GyYL5Pg58Aks2g==" + "version": "1.0.30000938", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000938.tgz", + "integrity": "sha512-ekW8NQ3/FvokviDxhdKLZZAx7PptXNwxKgXtnR5y+PR3hckwuP3yJ1Ir+4/c97dsHNqtAyfKUGdw8P4EYzBNgw==" }, "capture-stack-trace": { "version": "1.0.1", @@ -1848,23 +1858,6 @@ "typedarray": "^0.0.6" } }, - "concurrently": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/concurrently/-/concurrently-4.1.0.tgz", - "integrity": "sha512-pwzXCE7qtOB346LyO9eFWpkFJVO3JQZ/qU/feGeaAHiX1M3Rw3zgXKc5cZ8vSH5DGygkjzLFDzA/pwoQDkRNGg==", - "dev": true, - "requires": { - "chalk": "^2.4.1", - "date-fns": "^1.23.0", - "lodash": "^4.17.10", - "read-pkg": "^4.0.1", - "rxjs": "^6.3.3", - "spawn-command": "^0.0.2-1", - "supports-color": "^4.5.0", - "tree-kill": "^1.1.0", - "yargs": "^12.0.1" - } - }, "configstore": { "version": "3.1.2", "resolved": "https://registry.npmjs.org/configstore/-/configstore-3.1.2.tgz", @@ -1989,19 +1982,6 @@ "capture-stack-trace": "^1.0.0" } }, - "cross-spawn": { - "version": "6.0.5", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz", - "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==", - "dev": true, - "requires": { - "nice-try": "^1.0.4", - "path-key": "^2.0.1", - "semver": "^5.5.0", - "shebang-command": "^1.2.0", - "which": "^1.2.9" - } - }, "crypto-random-string": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-1.0.0.tgz", @@ -2031,12 +2011,6 @@ "assert-plus": "^1.0.0" } }, - "date-fns": { - "version": "1.29.0", - "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-1.29.0.tgz", - "integrity": "sha512-lbTXWZ6M20cWH8N9S6afb0SBm6tMk+uUg6z3MqHPKE9atmsY3kJkTm8vKe93izJ2B2+q5MV990sM2CHgtAZaOw==", - "dev": true - }, "debug": { "version": "2.6.9", "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", @@ -2232,9 +2206,9 @@ "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=" }, "electron-to-chromium": { - "version": "1.3.100", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.100.tgz", - "integrity": "sha512-cEUzis2g/RatrVf8x26L8lK5VEls1AGnLHk6msluBUg/NTB4wcXzExTsGscFq+Vs4WBBU2zbLLySvD4C0C3hwg==" + "version": "1.3.113", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.113.tgz", + "integrity": "sha512-De+lPAxEcpxvqPTyZAXELNpRZXABRxf+uL/rSykstQhzj/B0l1150G/ExIIxKc16lI89Hgz81J0BHAcbTqK49g==" }, "encodeurl": { "version": "1.0.2", @@ -2395,21 +2369,6 @@ "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-1.2.0.tgz", "integrity": "sha1-HIaZHYFq0eUEdQ5zh0Ik7PO+xQg=" }, - "execa": { - "version": "0.10.0", - "resolved": "https://registry.npmjs.org/execa/-/execa-0.10.0.tgz", - "integrity": "sha512-7XOMnz8Ynx1gGo/3hyV9loYNPWM94jG3+3T3Y8tsfSstFmETmENCMU/A/zj8Lyaj1lkgEepKepvd6240tBRvlw==", - "dev": true, - "requires": { - "cross-spawn": "^6.0.0", - "get-stream": "^3.0.0", - "is-stream": "^1.1.0", - "npm-run-path": "^2.0.0", - "p-finally": "^1.0.0", - "signal-exit": "^3.0.0", - "strip-eof": "^1.0.0" - } - }, "expand-brackets": { "version": "2.1.4", "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz", @@ -2705,15 +2664,6 @@ "unpipe": "~1.0.0" } }, - "find-up": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz", - "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==", - "dev": true, - "requires": { - "locate-path": "^3.0.0" - } - }, "findup-sync": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-2.0.0.tgz", @@ -3569,9 +3519,9 @@ } }, "globals": { - "version": "11.10.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-11.10.0.tgz", - "integrity": "sha512-0GZF1RiPKU97IHUO5TORo9w1PwrH/NBPl+fS7oMLdaTRiYmYbwK4NWoZWrAdd0/abG9R2BU+OiwyQpTpE6pdfQ==" + "version": "11.11.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-11.11.0.tgz", + "integrity": "sha512-WHq43gS+6ufNOEqlrDBxVEbb8ntfXrfAUU2ZOpCxrBdGKW3gyv8mCxAfIBD0DroPKGrJ2eSsXsLtY9MPntsyTw==" }, "globule": { "version": "1.2.1", @@ -3593,7 +3543,7 @@ }, "got": { "version": "6.7.1", - "resolved": "http://registry.npmjs.org/got/-/got-6.7.1.tgz", + "resolved": "https://registry.npmjs.org/got/-/got-6.7.1.tgz", "integrity": "sha1-JAzQV4WpoY5WHcG0S0HHY+8ejbA=", "requires": { "create-error-class": "^3.0.0", @@ -3691,9 +3641,9 @@ } }, "gulp-babel": { - "version": "8.0.0-beta.2", - "resolved": "https://registry.npmjs.org/gulp-babel/-/gulp-babel-8.0.0-beta.2.tgz", - "integrity": "sha512-GTC2PxAXWkp6u1fP+C5+kn5biQ0dKGhkOSSXvKAf3ykF0+R3tevmLm/zSIkc1+S7U1JwH3XTvuMwRL6LD+sEiw==", + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/gulp-babel/-/gulp-babel-8.0.0.tgz", + "integrity": "sha512-oomaIqDXxFkg7lbpBou/gnUkX51/Y/M2ZfSjL2hdqXTAlSWZcgZtd2o0cOH0r/eE8LWD0+Q/PsLsr2DKOoqToQ==", "requires": { "plugin-error": "^1.0.1", "replace-ext": "^1.0.0", @@ -3935,7 +3885,7 @@ }, "http-errors": { "version": "1.6.3", - "resolved": "http://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz", + "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz", "integrity": "sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=", "requires": { "depd": "~1.1.2", @@ -4241,7 +4191,7 @@ }, "is-obj": { "version": "1.0.1", - "resolved": "http://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz", + "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz", "integrity": "sha1-PkcprB9f3gJc19g6iW2rn09n2w8=" }, "is-path-inside": { @@ -4347,14 +4297,14 @@ "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=" }, "js-base64": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.5.0.tgz", - "integrity": "sha512-wlEBIZ5LP8usDylWbDNhKPEFVFdI5hCHpnVoT/Ysvoi/PRhJENm/Rlh9TvjYB38HFfKZN7OzEbRjmjvLkFw11g==" + "version": "2.5.1", + "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.5.1.tgz", + "integrity": "sha512-M7kLczedRMYX4L8Mdh4MzyAMM9O5osx+4FcOQuTvr3A9F2D9S5JXheN0ewNbrvK2UatkTRhL5ejGmGSjNMiZuw==" }, "js-levenshtein": { - "version": "1.1.5", - "resolved": "https://registry.npmjs.org/js-levenshtein/-/js-levenshtein-1.1.5.tgz", - "integrity": "sha512-ap2aTez3WZASzMmJvgvG+nsrCCrtHPQ+4YB+WQjYQpXgLkM+WqwkpzdlVs5l7Xhk128I/CisIk4CdXl7pIchUA==" + "version": "1.1.6", + "resolved": "https://registry.npmjs.org/js-levenshtein/-/js-levenshtein-1.1.6.tgz", + "integrity": "sha512-X2BB11YZtrRqY4EnQcLX5Rh373zbK4alC1FW7D7MBhL2gtcC17cTnr6DmfHZeS0s2rTHjUTMMHfG7gO8SSdw+g==" }, "js-tokens": { "version": "4.0.0", @@ -4371,12 +4321,6 @@ "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz", "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==" }, - "json-parse-better-errors": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz", - "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==", - "dev": true - }, "json-schema": { "version": "0.2.3", "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz", @@ -4529,7 +4473,7 @@ }, "load-json-file": { "version": "1.1.0", - "resolved": "http://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz", + "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz", "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=", "requires": { "graceful-fs": "^4.1.2", @@ -4605,16 +4549,6 @@ } } }, - "locate-path": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz", - "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==", - "dev": true, - "requires": { - "p-locate": "^3.0.0", - "path-exists": "^3.0.0" - } - }, "lodash": { "version": "4.17.11", "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz", @@ -4692,15 +4626,6 @@ "kind-of": "^6.0.2" } }, - "map-age-cleaner": { - "version": "0.1.3", - "resolved": "https://registry.npmjs.org/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz", - "integrity": "sha512-bJzx6nMoP6PDLPBFmg7+xRKeFZvFboMrGlxmNj9ClvX53KrmvM5bXFXEWjbz4cz1AFn+jWJ9z/DJSz7hrs0w3w==", - "dev": true, - "requires": { - "p-defer": "^1.0.0" - } - }, "map-cache": { "version": "0.2.2", "resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz", @@ -4740,17 +4665,6 @@ "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz", "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=" }, - "mem": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/mem/-/mem-4.0.0.tgz", - "integrity": "sha512-WQxG/5xYc3tMbYLXoXPm81ET2WDULiU5FxbuIoNbJqLOOI8zehXFdZuiUEgfdrU2mVB1pxBZUGlYORSrpuJreA==", - "dev": true, - "requires": { - "map-age-cleaner": "^0.1.1", - "mimic-fn": "^1.0.0", - "p-is-promise": "^1.1.0" - } - }, "meow": { "version": "3.7.0", "resolved": "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz", @@ -4816,12 +4730,6 @@ "mime-db": "~1.37.0" } }, - "mimic-fn": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz", - "integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==", - "dev": true - }, "minimatch": { "version": "3.0.4", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", @@ -4832,7 +4740,7 @@ }, "minimist": { "version": "1.2.0", - "resolved": "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=" }, "mitt": { @@ -4861,7 +4769,7 @@ }, "mkdirp": { "version": "0.5.1", - "resolved": "http://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=", "requires": { "minimist": "0.0.8" @@ -4869,7 +4777,7 @@ "dependencies": { "minimist": { "version": "0.0.8", - "resolved": "http://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=" } } @@ -4914,24 +4822,18 @@ }, "next-tick": { "version": "1.0.0", - "resolved": "http://registry.npmjs.org/next-tick/-/next-tick-1.0.0.tgz", + "resolved": "https://registry.npmjs.org/next-tick/-/next-tick-1.0.0.tgz", "integrity": "sha1-yobR/ogoFpsBICCOPchCS524NCw=" }, "nhsuk-frontend": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/nhsuk-frontend/-/nhsuk-frontend-1.0.0.tgz", - "integrity": "sha512-fj06+OCGFXbPeIcnDOSrDDyFDc91mZq53OhRdjrmjcxGy6hCICpx44GT4DXELFxhYkyARfm5hAtakC4bpF5kwQ==", + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/nhsuk-frontend/-/nhsuk-frontend-1.0.1.tgz", + "integrity": "sha512-A8sHCmHzwEPasgvrYXZrBCoteSk1sXHYgTUB9g9HO0QFjAd7YGvEf+bF9VyisexOrmDruvS0knYMu83jq2Mizw==", "requires": { "accessible-autocomplete": "^1.6.2", "sass-mq": "^4.0.2" } }, - "nice-try": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz", - "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==", - "dev": true - }, "node-gyp": { "version": "3.8.0", "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-3.8.0.tgz", @@ -4953,15 +4855,15 @@ "dependencies": { "semver": { "version": "5.3.0", - "resolved": "http://registry.npmjs.org/semver/-/semver-5.3.0.tgz", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz", "integrity": "sha1-myzl094C0XxgEq0yaqa00M9U+U8=" } } }, "node-releases": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.3.tgz", - "integrity": "sha512-6VrvH7z6jqqNFY200kdB6HdzkgM96Oaj9v3dqGfgp6mF+cHmU4wyQKZ2/WPDRVoR0Jz9KqbamaBN0ZhdUaysUQ==", + "version": "1.1.8", + "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.8.tgz", + "integrity": "sha512-gQm+K9mGCiT/NXHy+V/ZZS1N/LOaGGqRAAJJs3X9Ah1g+CIbRcBgNyoNYQ+SEtcyAtB9KqDruu+fF7nWjsqRaA==", "requires": { "semver": "^5.3.0" } @@ -4999,7 +4901,7 @@ }, "chalk": { "version": "1.1.3", - "resolved": "http://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", "requires": { "ansi-styles": "^2.2.1", @@ -5125,20 +5027,19 @@ "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=" }, "nunjucks": { - "version": "3.1.6", - "resolved": "https://registry.npmjs.org/nunjucks/-/nunjucks-3.1.6.tgz", - "integrity": "sha512-aHCt5arZUqHnRNjfDBCq+fI/O3J2sxx+xZdz6mCNvwAgJVCtHM/VAv2++figjGeFyrZ1dVcJ1dCJwMxY8iYoqQ==", + "version": "3.1.7", + "resolved": "https://registry.npmjs.org/nunjucks/-/nunjucks-3.1.7.tgz", + "integrity": "sha512-MrjI68cobXQnyMK/LeY7BgYZ+7o4xn1UNGOe1y8ACVo4cn/1FXc1S4ySqHbmzFqxq/qtMWrehysTuXdbTvf7JA==", "requires": { "a-sync-waterfall": "^1.0.0", "asap": "^2.0.3", "chokidar": "^2.0.0", - "postinstall-build": "^5.0.1", "yargs": "^3.32.0" }, "dependencies": { "yargs": { "version": "3.32.0", - "resolved": "http://registry.npmjs.org/yargs/-/yargs-3.32.0.tgz", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.32.0.tgz", "integrity": "sha1-AwiOnr+edWtpdRYR0qXvWRSCyZU=", "requires": { "camelcase": "^2.0.1", @@ -5329,7 +5230,7 @@ }, "os-locale": { "version": "1.4.0", - "resolved": "http://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz", + "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz", "integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=", "requires": { "lcid": "^1.0.0" @@ -5349,47 +5250,11 @@ "os-tmpdir": "^1.0.0" } }, - "p-defer": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/p-defer/-/p-defer-1.0.0.tgz", - "integrity": "sha1-n26xgvbJqozXQwBKfU+WsZaw+ww=", - "dev": true - }, "p-finally": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz", "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=" }, - "p-is-promise": { - "version": "1.1.0", - "resolved": "http://registry.npmjs.org/p-is-promise/-/p-is-promise-1.1.0.tgz", - "integrity": "sha1-nJRWmJ6fZYgBewQ01WCXZ1w9oF4=", - "dev": true - }, - "p-limit": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.0.0.tgz", - "integrity": "sha512-fl5s52lI5ahKCernzzIyAP0QAZbGIovtVHGwpcu1Jr/EpzLVDI2myISHwGqK7m8uQFugVWSrbxH7XnhGtvEc+A==", - "dev": true, - "requires": { - "p-try": "^2.0.0" - } - }, - "p-locate": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz", - "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==", - "dev": true, - "requires": { - "p-limit": "^2.0.0" - } - }, - "p-try": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.0.0.tgz", - "integrity": "sha512-hMp0onDKIajHfIkdRk3P4CdCmErkYAxxDtP3Wx/4nZ3aGlau2VKh3mZpcuFkH27WQkL/3WBCPOktzA9ZOAnMQQ==", - "dev": true - }, "package-json": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/package-json/-/package-json-4.0.1.tgz", @@ -5437,16 +5302,6 @@ } } }, - "parse-json": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz", - "integrity": "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=", - "dev": true, - "requires": { - "error-ex": "^1.3.1", - "json-parse-better-errors": "^1.0.1" - } - }, "parse-node-version": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/parse-node-version/-/parse-node-version-1.0.0.tgz", @@ -5497,12 +5352,6 @@ "resolved": "https://registry.npmjs.org/path-dirname/-/path-dirname-1.0.2.tgz", "integrity": "sha1-zDPSTVJeCZpTiMAzbG4yuRYGCeA=" }, - "path-exists": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz", - "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=", - "dev": true - }, "path-is-absolute": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", @@ -5606,11 +5455,6 @@ "resolved": "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz", "integrity": "sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=" }, - "postinstall-build": { - "version": "5.0.3", - "resolved": "https://registry.npmjs.org/postinstall-build/-/postinstall-build-5.0.3.tgz", - "integrity": "sha512-vPvPe8TKgp4FLgY3+DfxCE5PIfoXBK2lyLfNCxsRbDsV6vS4oU5RG/IWxrblMn6heagbnMED3MemUQllQ2bQUg==" - }, "preact": { "version": "8.4.2", "resolved": "https://registry.npmjs.org/preact/-/preact-8.4.2.tgz", @@ -5628,7 +5472,7 @@ }, "pretty-hrtime": { "version": "1.0.3", - "resolved": "http://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz", + "resolved": "https://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz", "integrity": "sha1-t+PqQkNaTJsnWdmeDyAesZWALuE=" }, "private": { @@ -5748,17 +5592,6 @@ "strip-json-comments": "~2.0.1" } }, - "read-pkg": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-4.0.1.tgz", - "integrity": "sha1-ljYlN48+HE1IyFhytabsfV0JMjc=", - "dev": true, - "requires": { - "normalize-package-data": "^2.3.2", - "parse-json": "^4.0.0", - "pify": "^3.0.0" - } - }, "read-pkg-up": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz", @@ -5799,7 +5632,7 @@ }, "readable-stream": { "version": "2.3.6", - "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", "requires": { "core-util-is": "~1.0.0", @@ -5876,6 +5709,11 @@ "safe-regex": "^1.1.0" } }, + "regexp-tree": { + "version": "0.1.5", + "resolved": "https://registry.npmjs.org/regexp-tree/-/regexp-tree-0.1.5.tgz", + "integrity": "sha512-nUmxvfJyAODw+0B13hj8CFVAxhe7fDEAgJgaotBu3nnR+IgGgZq59YedJP5VYTlkEfqjuK6TuRpnymKdatLZfQ==" + }, "regexpu-core": { "version": "4.4.0", "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-4.4.0.tgz", @@ -6089,15 +5927,6 @@ "resolved": "https://registry.npmjs.org/rx/-/rx-4.1.0.tgz", "integrity": "sha1-pfE/957zt0D+MKqAP7CfmIBdR4I=" }, - "rxjs": { - "version": "6.3.3", - "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.3.3.tgz", - "integrity": "sha512-JTWmoY9tWCs7zvIk/CvRjhjGaOd+OVBM987mxFo+OW66cGpdKjZcpmc74ES1sB//7Kl/PAe8+wEakuhG4pcgOw==", - "dev": true, - "requires": { - "tslib": "^1.9.0" - } - }, "safe-buffer": { "version": "5.1.1", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz", @@ -6591,12 +6420,6 @@ "resolved": "https://registry.npmjs.org/sparkles/-/sparkles-1.0.1.tgz", "integrity": "sha512-dSO0DDYUahUt/0/pD/Is3VIm5TGJjludZ0HVymmhYF6eNA53PVLhnUk0znSYbH8IYBuJdCE+1luR22jNLMaQdw==" }, - "spawn-command": { - "version": "0.0.2-1", - "resolved": "https://registry.npmjs.org/spawn-command/-/spawn-command-0.0.2-1.tgz", - "integrity": "sha1-YvXpRmmBwbeW3Fkpk34RycaSG9A=", - "dev": true - }, "spdx-correct": { "version": "3.0.2", "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.0.2.tgz", @@ -6634,9 +6457,9 @@ } }, "sshpk": { - "version": "1.15.2", - "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.15.2.tgz", - "integrity": "sha512-Ra/OXQtuh0/enyl4ETZAfTaeksa6BXks5ZcjpSUNrjBr0DvrJKX+1fsKDPpT9TBXgHAFsa4510aNVgI8g/+SzA==", + "version": "1.16.1", + "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz", + "integrity": "sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==", "requires": { "asn1": "~0.2.3", "assert-plus": "^1.0.0", @@ -6765,23 +6588,6 @@ "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz", "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=" }, - "supports-color": { - "version": "4.5.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz", - "integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=", - "dev": true, - "requires": { - "has-flag": "^2.0.0" - }, - "dependencies": { - "has-flag": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz", - "integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=", - "dev": true - } - } - }, "sver-compat": { "version": "1.5.0", "resolved": "https://registry.npmjs.org/sver-compat/-/sver-compat-1.5.0.tgz", @@ -7000,12 +6806,6 @@ } } }, - "tree-kill": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/tree-kill/-/tree-kill-1.2.1.tgz", - "integrity": "sha512-4hjqbObwlh2dLyW4tcz0Ymw0ggoaVDMveUB9w8kFSQScdRLo0gxO9J7WFcUBo+W3C1TLdFIEwNOWebgZZ0RH9Q==", - "dev": true - }, "trim-newlines": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz", @@ -7024,12 +6824,6 @@ "glob": "^7.1.2" } }, - "tslib": { - "version": "1.9.3", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.9.3.tgz", - "integrity": "sha512-4krF8scpejhaOgqzBEcGM7yDIEfi0/8+8zDRZhNZZ2kjmHJ4hv3zCbQWxoJGz1iw5U0Jl0nma13xzHXcncMavQ==", - "dev": true - }, "tunnel-agent": { "version": "0.6.0", "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz", @@ -7413,12 +7207,6 @@ "isexe": "^2.0.0" } }, - "which-module": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz", - "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=", - "dev": true - }, "wide-align": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz", @@ -7526,114 +7314,6 @@ "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz", "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=" }, - "yargs": { - "version": "12.0.5", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-12.0.5.tgz", - "integrity": "sha512-Lhz8TLaYnxq/2ObqHDql8dX8CJi97oHxrjUcYtzKbbykPtVW9WB+poxI+NM2UIzsMgNCZTIf0AQwsjK5yMAqZw==", - "dev": true, - "requires": { - "cliui": "^4.0.0", - "decamelize": "^1.2.0", - "find-up": "^3.0.0", - "get-caller-file": "^1.0.1", - "os-locale": "^3.0.0", - "require-directory": "^2.1.1", - "require-main-filename": "^1.0.1", - "set-blocking": "^2.0.0", - "string-width": "^2.0.0", - "which-module": "^2.0.0", - "y18n": "^3.2.1 || ^4.0.0", - "yargs-parser": "^11.1.1" - }, - "dependencies": { - "ansi-regex": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", - "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", - "dev": true - }, - "cliui": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-4.1.0.tgz", - "integrity": "sha512-4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ==", - "dev": true, - "requires": { - "string-width": "^2.1.1", - "strip-ansi": "^4.0.0", - "wrap-ansi": "^2.0.0" - } - }, - "invert-kv": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-2.0.0.tgz", - "integrity": "sha512-wPVv/y/QQ/Uiirj/vh3oP+1Ww+AWehmi1g5fFWGPF6IpCBCDVrhgHRMvrLfdYcwDh3QJbGXDW4JAuzxElLSqKA==", - "dev": true - }, - "is-fullwidth-code-point": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", - "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=", - "dev": true - }, - "lcid": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/lcid/-/lcid-2.0.0.tgz", - "integrity": "sha512-avPEb8P8EGnwXKClwsNUgryVjllcRqtMYa49NTsbQagYuT1DcXnl1915oxWjoyGrXR6zH/Y0Zc96xWsPcoDKeA==", - "dev": true, - "requires": { - "invert-kv": "^2.0.0" - } - }, - "os-locale": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-3.0.1.tgz", - "integrity": "sha512-7g5e7dmXPtzcP4bgsZ8ixDVqA7oWYuEz4lOSujeWyliPai4gfVDiFIcwBg3aGCPnmSGfzOKTK3ccPn0CKv3DBw==", - "dev": true, - "requires": { - "execa": "^0.10.0", - "lcid": "^2.0.0", - "mem": "^4.0.0" - } - }, - "string-width": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", - "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", - "dev": true, - "requires": { - "is-fullwidth-code-point": "^2.0.0", - "strip-ansi": "^4.0.0" - } - }, - "strip-ansi": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", - "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", - "dev": true, - "requires": { - "ansi-regex": "^3.0.0" - } - } - } - }, - "yargs-parser": { - "version": "11.1.1", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-11.1.1.tgz", - "integrity": "sha512-C6kB/WJDiaxONLJQnF8ccx9SEeoTTLek8RVbaOIsrAUS8VrBEXfmeSnCZxygc+XC2sNMBIwOOnfcxiynjHsVSQ==", - "dev": true, - "requires": { - "camelcase": "^5.0.0", - "decamelize": "^1.2.0" - }, - "dependencies": { - "camelcase": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.0.0.tgz", - "integrity": "sha512-faqwZqnWxbxn+F1d399ygeamQNy3lPp/H9H6rNrqYh4FSVCtcY+3cub1MxA8o9mDd55mM8Aghuu/kuyYA6VTsA==", - "dev": true - } - } - }, "yeast": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/yeast/-/yeast-0.1.2.tgz", diff --git a/package.json b/package.json index 0dd9fded..0928d06e 100755 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "nhsuk-prototype-kit", - "version": "0.0.1", - "description": "NHS.UK prototype kit", + "version": "1.0.1", + "description": "Rapidly create HTML prototypes of NHS websites and services.", "main": "app.js", "scripts": { "build": "gulp build", @@ -14,8 +14,8 @@ "author": "https://github.com/nhsuk/", "license": "MIT", "dependencies": { - "@babel/core": "^7.2.2", - "@babel/preset-env": "^7.2.3", + "@babel/core": "^7.3.3", + "@babel/preset-env": "^7.3.1", "basic-auth": "^2.0.1", "body-parser": "^1.18.3", "browser-sync": "^2.26.3", @@ -24,18 +24,16 @@ "express": "^4.16.4", "express-session": "^1.13.0", "gulp": "^4.0.0", - "gulp-babel": "^8.0.0-beta.2", + "gulp-babel": "^8.0.0", "gulp-clean": "^0.4.0", "gulp-clean-css": "^4.0.0", "gulp-nodemon": "^2.4.2", "gulp-rename": "^1.4.0", "gulp-sass": "^4.0.2", "keypather": "^3.0.0", - "nhsuk-frontend": "^1.0.0", - "nunjucks": "^3.1.6", + "nhsuk-frontend": "^1.0.1", + "nunjucks": "^3.1.7", "path": "^0.12.7" }, - "devDependencies": { - "concurrently": "^4.1.0" - } + "devDependencies": {} }