From 03b2f35c90d6223a54b59040bf8021949192babf Mon Sep 17 00:00:00 2001 From: Andrzej Pogonowski Date: Mon, 17 Jun 2019 10:36:21 +0100 Subject: [PATCH 1/2] Upgrading the node version --- .npmrc | 2 +- .nvmrc | 2 +- Jenkinsfile | 2 +- package-lock.json | 41 ++++++++++++++++++++++++++++++----------- 4 files changed, 33 insertions(+), 14 deletions(-) diff --git a/.npmrc b/.npmrc index 316d64a789..3db68d0ec8 100644 --- a/.npmrc +++ b/.npmrc @@ -1 +1 @@ -version=6.4.1 \ No newline at end of file +version=6.9.0 \ No newline at end of file diff --git a/.nvmrc b/.nvmrc index cc5875fabb..f0da094414 100644 --- a/.nvmrc +++ b/.nvmrc @@ -1 +1 @@ -v10.15.3 +v10.16.0 diff --git a/Jenkinsfile b/Jenkinsfile index 17f243cbfc..eb26009a6d 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,7 +1,7 @@ #!/usr/bin/env groovy def dockerRegistry = "329802642264.dkr.ecr.eu-west-1.amazonaws.com" -def nodeImageVersion = "0.0.2" +def nodeImageVersion = "10.16.0" def nodeImage = "${dockerRegistry}/bbc-news/node-10-lts:${nodeImageVersion}" def nodeName diff --git a/package-lock.json b/package-lock.json index 1b8f9411a3..1fea242da0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9662,7 +9662,8 @@ "ansi-regex": { "version": "2.1.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "aproba": { "version": "1.2.0", @@ -9683,12 +9684,14 @@ "balanced-match": { "version": "1.0.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "brace-expansion": { "version": "1.1.11", "bundled": true, "dev": true, + "optional": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -9703,17 +9706,20 @@ "code-point-at": { "version": "1.1.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "concat-map": { "version": "0.0.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "console-control-strings": { "version": "1.1.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "core-util-is": { "version": "1.0.2", @@ -9830,7 +9836,8 @@ "inherits": { "version": "2.0.3", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "ini": { "version": "1.3.5", @@ -9842,6 +9849,7 @@ "version": "1.0.0", "bundled": true, "dev": true, + "optional": true, "requires": { "number-is-nan": "^1.0.0" } @@ -9856,6 +9864,7 @@ "version": "3.0.4", "bundled": true, "dev": true, + "optional": true, "requires": { "brace-expansion": "^1.1.7" } @@ -9863,12 +9872,14 @@ "minimist": { "version": "0.0.8", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "minipass": { "version": "2.3.5", "bundled": true, "dev": true, + "optional": true, "requires": { "safe-buffer": "^5.1.2", "yallist": "^3.0.0" @@ -9887,6 +9898,7 @@ "version": "0.5.1", "bundled": true, "dev": true, + "optional": true, "requires": { "minimist": "0.0.8" } @@ -9967,7 +9979,8 @@ "number-is-nan": { "version": "1.0.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "object-assign": { "version": "4.1.1", @@ -9979,6 +9992,7 @@ "version": "1.4.0", "bundled": true, "dev": true, + "optional": true, "requires": { "wrappy": "1" } @@ -10064,7 +10078,8 @@ "safe-buffer": { "version": "5.1.2", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "safer-buffer": { "version": "2.1.2", @@ -10100,6 +10115,7 @@ "version": "1.0.2", "bundled": true, "dev": true, + "optional": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", @@ -10119,6 +10135,7 @@ "version": "3.0.1", "bundled": true, "dev": true, + "optional": true, "requires": { "ansi-regex": "^2.0.0" } @@ -10162,12 +10179,14 @@ "wrappy": { "version": "1.0.2", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "yallist": { "version": "3.0.3", "bundled": true, - "dev": true + "dev": true, + "optional": true } } }, From c4298012505f3efffd71c07a235e496cc02820ac Mon Sep 17 00:00:00 2001 From: Andrzej Pogonowski Date: Mon, 17 Jun 2019 14:01:38 +0100 Subject: [PATCH 2/2] Updating the changelog --- CHANGELOG.md | 1 + package.json | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e9106d479e..3d4de9fd35 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ | Version | Description | |---------|-------------| +| 1.1.9 | [PR#641](https://github.com/bbc/psammead/pull/641) Upgrade to Node 10.16.0 | | 1.1.8 | [PR#631](https://github.com/BBC/psammead/pull/631) Update Storybook version and other dependencies | | 1.1.7 | [PR#536](https://github.com/BBC/psammead/pull/536) Add viewport addon | | 1.1.6 | [PR#514](https://github.com/BBC/psammead/pull/514) Upgrade to Node 10 | diff --git a/package.json b/package.json index 8687d207e6..4b198c2947 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@bbc/psammead", - "version": "1.1.8", + "version": "1.1.9", "description": "Core Components Library Developed & Maintained By The Articles and Reach & Languages Team", "main": "index.js", "scripts": {