Extensions

.gitattributes

@@ -0,0 +1,9 @@
+# dont include the following files in the zip
+.gitattributes export-ignore
+README.md export-ignore
+CHANGELOG.md export-ignore
+CONTRIBUTING.md export-ignore
+create-release.sh export-ignore
+travis.yml export-ignore
+.travis export-ignore
+app.json export-ignore

.gitignore

@@ -1,5 +1,7 @@
 # ignore tracking usage data config - we want a different one for each user
 usage-data-config.json
+# ignore extension SCSS because it's dynamically generated
+lib/extensions/_extensions.scss
 .env
 .sass-cache
 .DS_Store

.travis.yml

@@ -1,20 +1,37 @@
 language: node_js
+
 node_js:
-- "lts/*"
-before_deploy:
-- test $TRAVIS_TEST_RESULT = 0
-before_install:
-- npm install -g mocha
-deploy:
-- provider: script    # (If version.txt is updated) - create a new tag and push to Github, update the latest-release branch
-  script: ./create-release.sh
-  on: master
-  # Automatic deploys are enabled in Heroku for this app
-  # Every push to master will deploy a new version of this app. Deploys happen automatically.
-  # Heroku will wait for CI to pass before deploying.
+  - "lts/*"
+  - "8"
+
+os:
+  - linux
+  - osx
+  - windows
+
+jobs:
+  include:
+    # If version.txt is updated on the master branch:
+    # - create a new tag and push it to Github
+    # - update the latest-release branch
+    - stage: deploy
+      name: "Create release on GitHub 🚀"
+      os: linux
+      script: echo "Checking whether we should release..."
+      deploy:
+      - provider: script
+        script: ./create-release.sh
+        on:
+          branch: master
+      env:
+      # DEPLOY_KEY
+      - secure: qpuH/3v+wsMLy9C3bGjallB6KxFQAtDlyZf3jmX8UQ0703tIvBnZoC1h9EJXOqxZbirLPHon7g902nOuhqUfrsPQgV7XEmXMGZsp31PuK/1lkyTCG3fAdeg8wcghwZn10Gw8jYZpOfWIf2GPDL+6utIU6Aog+odcls7tHWLVT80=
+
+# Automatic deploys are also enabled in Heroku for this app
+# Every push to master will automatically deploy a new version of this app.
+# Heroku will wait for CI to pass before deploying.
+
 notifications:
   email: false
+
 sudo: false
-env:
-  global:
-  - secure: esj3ut+TwKX25QzU1koJyTVIX+x1V55graI65X8LiYXKcOP040VPJ9lIC0HeRs5UViBM0Ur1F93rGdgW2zYVzu5MLZoH7KjpzMcG30x+FDqLChT0JfNcLLtLm/wIhx/OAAmsBxXlvjPp092BeEKd3Jug8d329TxwwK5G5XxAatg=

.travis/README.md

@@ -1,18 +1,48 @@
 # Travis encrypted files
 
-This directory contains a public/private keypair generated just for this repository.
+This directory contains an encrypted private deploy key with write access to the
+Prototype Kit repository.
 
-The public key is a deploy key which has been added to the GitHub repo for push access.
+It has been encrypted using a key stored in the DEPLOY_KEY environment
+variable, which is itself encrypted using `travis encrypt`.
 
-The private key is encrypted using `travis encrypt-file` and then committed to this repo.
+The deploy key is decrypted in create-release.sh.
 
-The decrypt commands are in `.travis.yml`.
+To update the key:
 
-To regenerate a key:
+1. Generate a new keypair using ssh-keygen
+
+  ```
+  ssh-keygen -b 4096 -f .travis/prototype-kit-deploy-key
+  ```
 
-```
-ssh-keygen -b 4096 -f .travis/govuk_prototype_kit   # Make a new keypair
-travis encrypt-file .travis/govuk_prototype_kit     # Encrypt the private key
-mv govuk_prototype_kit.enc .travis/                 # Move the private key to the right place
-rm .travis/govuk_prototype_kit                      # Remove the unencrypted private key
-```
+2. Add the *public* key as a new [deploy key], with write access to the
+   repository
+
+  ```
+  cat .travis/prototype-kit-deploy-key.pub
+  ```
+
+2. Generate a new random string which we can use as an encryption key
+
+3. Encrypt the private key using ssh-keygen
+
+  ```
+  openssl aes-256-cbc -k [encryption key here] \
+    -in prototype-kit-deploy-key \
+    -out prototype-kit-deploy-key.enc
+  ```
+
+4. Remove the unencrypted private key and the public key
+
+5. Encrypt the private key using the encryption key
+
+  ```
+  travis encrypt DEPLOY_KEY=[encryption key]
+  ```
+
+6. Add the encrypted variable to the environment variables for the deploy job
+   in .travis.yml
+
+
+[deploy key]: https://github.com/alphagov/govuk-prototype-kit/settings/keys

CHANGELOG.md

@@ -1,3 +1,81 @@
+# 8.7.0
+
+Features:
+- [#613 Update to GOV.UK Frontend version 2.7.0 and adds experimental extensions feature](https://github.com/alphagov/govuk-prototype-kit/pull/613) (See GOV.UK Frontend 2.7.0 [release notes](https://github.com/alphagov/govuk-frontend/releases/tag/v2.7.0)). Big thanks @matcarey (https://github.com/matcarey)
+  As this is an **experimental** feature it should be used at your own risk, and is likely to change. Please contact us if you're interested in trying it out.
+
+- [#687 Update docs and package.json to Node 10 LTS](https://github.com/alphagov/govuk-prototype-kit/pull/687)
+
+- [#683 add guidance for CSS, JavaScript and images](https://github.com/alphagov/govuk-prototype-kit/pull/683)
+
+# 8.6.0
+
+Features:
+- [#680 Update to GOV.UK Frontend version 2.6.0](https://github.com/alphagov/govuk-prototype-kit/pull/680) (See GOV.UK Frontend 2.6.0 [release notes](https://github.com/alphagov/govuk-frontend/releases/tag/v2.6.0))
+
+# 8.5.0
+
+Features:
+- [#672 Replace ‘check answers’ pattern with updated code](https://github.com/alphagov/govuk-prototype-kit/pull/672)
+- [#671 Update to GOV.UK Frontend version 2.5.0](https://github.com/alphagov/govuk-prototype-kit/pull/671)
+   Allows use of new components Accordion and Summary List
+
+Fixes:
+
+- [#667 Add acorn dependency to fix npm warning](https://github.com/alphagov/govuk-prototype-kit/pull/667)
+- [#647 Fix link context in step-by-step templates](https://github.com/alphagov/govuk-prototype-kit/pull/647)
+
+Internal:
+
+- [#663 update Standard to 12.0.1](https://github.com/alphagov/govuk-prototype-kit/pull/663)
+- [#640 Replace Mocha with Jest](https://github.com/alphagov/govuk-prototype-kit/pull/640)
+- [#659 Upgrade kit to use Gulp 4](https://github.com/alphagov/govuk-prototype-kit/pull/659)
+- [#664 Remove deprecated gulp-util](https://github.com/alphagov/govuk-prototype-kit/pull/664)
+
+# 8.4.0
+
+New features:
+
+- [#642 Update GOV.UK Frontend to v2.4.0](https://github.com/alphagov/govuk-prototype-kit/pull/642)
+
+Bug fixes:
+
+- [#634 Avoid double-nested buttons in step-by-step navigation](https://github.com/alphagov/govuk-prototype-kit/pull/634)
+
+- [#638 Make unbranded template available for use in app/views](https://github.com/alphagov/govuk-prototype-kit/pull/638)
+
+# 8.3.0
+
+New features:
+
+- [#628 Update GOV.UK Frontend to v2.3.0](https://github.com/alphagov/govuk-prototype-kit/pull/628)
+
+- [#574 Add Notify integration guidance](https://github.com/alphagov/govuk-prototype-kit/pull/574)
+
+- [Add npm install reminder when prototype crashes](https://github.com/alphagov/govuk-prototype-kit/pull/598)
+
+- [#539 Add step by step navigation](https://github.com/alphagov/govuk-prototype-kit/pull/539)
+
+# 8.2.0
+
+New Features:
+
+- [#609 Update GOV.UK Frontend to v2.2.0](https://github.com/alphagov/govuk-prototype-kit/pull/609)
+
+Also includes a new character-count component
+
+Bug fixes:
+
+- [#605 Set stylesheet media to "all" to allow print styles](https://github.com/alphagov/govuk-prototype-kit/pull/605)
+
+- [#608 Clearing session data now uses a POST request rather than a destructive GET request](https://github.com/alphagov/govuk-prototype-kit/pull/608)
+
+# 8.1.0
+
+New features:
+
+- [#600 Update GOV.UK Frontend to v2.1.0](https://github.com/alphagov/govuk-prototype-kit/pull/600)
+
 # 8.0.0
 
 Breaking changes:

CONTRIBUTING.md

@@ -3,12 +3,13 @@
 We really like contributions and bug reports, in fact the project wouldn't have got to this stage without them.
 We do have a few guidelines to bear in mind.
 
-## Community
+## Contributing
 
-We have two Slack channels for the Prototype Kit. You'll need a government email address to join them.
+If you’ve got an idea or suggestion you can:
 
-* [Slack channel for users of the Prototype Kit](https://ukgovernmentdigital.slack.com/messages/prototype-kit/)
-* [Slack channel for developers of the Prototype Kit](https://ukgovernmentdigital.slack.com/messages/prototype-kit-dev/)
+* email [govuk-design-system-support@digital.cabinet-office.gov.uk](mailto:govuk-design-system-support@digital.cabinet-office.gov.uk)
+* [get in touch on developer Slack channel](https://ukgovernmentdigital.slack.com/messages/prototype-kit-dev)([open in app](slack://channel?team=T04V6EBTR&id=C0E1063DW))
+* [create a GitHub issue](https://github.com/alphagov/govuk-prototype-kit/issues)       
 
 ## Raising bugs
 
@@ -51,16 +52,43 @@ which describes how we prefer git history and commit messages to read.
 
 ## To release a new version
 
-Checkout a new branch for the release.
+1. Checkout master and pull latest changes.
 
-Update [CHANGELOG.md](https://github.com/alphagov/govuk-prototype-kit/blob/master/CHANGELOG.md) to summarise the changes made since the last release.
+2. Decide on a new version number. Do this by looking at the [current "Unreleased" CHANGELOG](../../CHANGELOG.md) changes and updating the previous release number depending on the kind of entries:
 
-To see the commits to be summarised in the changelog since the last release, [compare the latest-release branch with master](https://github.com/alphagov/govuk-prototype-kit/compare/latest-release...master).
+When you fix a bug and your code stays backwards compatible, increase the patch component:
 
-Propose a new version number in [VERSION.txt](https://github.com/alphagov/govuk-prototype-kit/blob/master/VERSION.txt) and update line 4 in [package.json](https://github.com/alphagov/govuk-prototype-kit/blob/master/package.json#L4) with the new version number.
+```
+v0.0.3 // Before bugfix
+v0.0.4 // After bugfix
+```
 
-Open a new pull request with a single commit including the above changes.
+When you add functionality and your code stays backwards compatible, increase the minor component and reset the patch component to zero:
 
-[Here is an example for v6.1.0](https://github.com/alphagov/govuk-prototype-kit/commit/53e36d79a994ce3649b53f4008370cd75068c27c).
+```
+v0.2.4 // Before addition of new functionality
+v0.3.0 // After addition of new functionality
+```
 
-Once merged into master a new version will be built.
+When you implement changes and your code becomes backwards incompatible, increase the major component and reset the minor and patch components to zero:
+
+```
+v7.3.5 // Before implementing backwards incompatible changes
+v8.0.0 // After implementing backwards incompatible changes
+```
+
+(From [jvandemo.com](https://www.jvandemo.com/a-simple-guide-to-semantic-versioning/))
+
+3. Checkout a new branch called release-[new version number].
+
+4. Update the version number in [VERSION.txt](https://github.com/alphagov/govuk-prototype-kit/blob/master/VERSION.txt) and update "version" in [package.json](https://github.com/alphagov/govuk-prototype-kit/blob/master/package.json#L4).
+
+5. Commit your changes and open a new pull request on GitHub - copy the relevant Changelog section into the description.
+
+6. Once someone has merged the pull request, [draft a new release on GitHub](https://github.com/alphagov/govuk-prototype-kit/releases)
+
+7. In Tag version and Release title, put v[version number], for example `v7.0.0`.
+
+8. In description, paste the relevant section from the Changelog.
+
+9. Click 'Publish release'.

Procfile

@@ -1 +1 @@
-web: node ./node_modules/gulp/bin/gulp generate-assets && node server.js
+web: node ./node_modules/gulp/bin/gulp generate-assets && node listen-on-port.js

README.md

@@ -19,9 +19,17 @@ You must protect user privacy at all times, even when using prototypes. Prototyp
 - [Installation guide for new users (non technical)](https://govuk-prototype-kit.herokuapp.com/docs/install/introduction)
 - [Installation guide for developers (technical)](https://govuk-prototype-kit.herokuapp.com/docs/install/developer-install-instructions)
 
-## Community
+## Support
 
-We have two Slack channels for the Prototype Kit. You'll need a government email address to join them.
+The GOV.UK Prototype Kit is maintained by the Government Digital Service. If you’ve got a question or need support you can:
 
-* [Slack channel for users of the Prototype Kit](https://ukgovernmentdigital.slack.com/messages/prototype-kit/)
-* [Slack channel for developers of the Prototype Kit](https://ukgovernmentdigital.slack.com/messages/prototype-kit-dev/)
+* email [govuk-design-system-support@digital.cabinet-office.gov.uk](mailto:govuk-design-system-support@digital.cabinet-office.gov.uk) 
+* [get in touch on Slack](https://ukgovernmentdigital.slack.com/messages/prototype-kit)([open in app](slack://channel?team=T04V6EBTR&id=C0647LW4R)) 
+* [view known issues on GitHub](https://github.com/alphagov/govuk-prototype-kit/issues)
+
+## Contributing
+
+If you’ve got an idea or suggestion you can:
+
+* [get in touch on the developer Slack channel](https://ukgovernmentdigital.slack.com/messages/prototype-kit-dev)([open in app](slack://channel?team=T04V6EBTR&id=C0E1063DW))
+* [create a GitHub issue](https://github.com/alphagov/govuk-prototype-kit/issues)

VERSION.txt

@@ -1 +1 @@
-8.0.0
+8.7.0

__tests__/spec/force-https-redirect.js

@@ -0,0 +1,27 @@
+/* eslint-env jest */
+const request = require('supertest')
+let app
+
+/* Setup Environment Variables before setting App */
+process.env.NODE_ENV = 'production'
+process.env.USE_HTTPS = 'true'
+app = require('../../server.js')
+
+describe('The Prototype Kit - force HTTPS redirect functionality', () => {
+  describe('should in a production environment', () => {
+    it('have HTTP header "location" field that begins with https', async () => {
+      const response = await request(app).get('/docs')
+      expect(response.header['location'].startsWith('https://')).toBeTruthy()
+    })
+
+    it('redirect to the same HTTPS url', async () => {
+      const response = await request(app).get('/docs')
+      expect(response.header['location'].endsWith('/docs')).toBeTruthy()
+    })
+
+    it('have HTTP header "status" field that indicates a redirect', async () => {
+      const response = await request(app).get('/docs')
+      expect(response.statusCode).toBe(302)
+    })
+  })
+})