chore: rebasing and linting

newsuk · Oct 3, 2018 · 2e2b7b4 · 2e2b7b4
1 parent e3ff38a
commit 2e2b7b4
Show file tree

Hide file tree

Showing 16 changed files with 33 additions and 20 deletions.
diff --git a/packages/article/article.showcase.js b/packages/article/article.showcase.js
@@ -41,7 +41,7 @@ const renderArticle = ({
 }) => (
   <ArticleProvider debounceTimeMs={0} id={id}>
     {({ article, isLoading, error, refetch }) => (
-      <Context.Provider value={{ theme: { scale, sectionColour } }}>
+      <Context.Provider value={{ theme: { scale, sectionColour}, makeUrl }}>
         <Article
           adConfig={adConfig}
           analyticsStream={analyticsStream}

diff --git a/packages/author-profile/package.json b/packages/author-profile/package.json
@@ -73,7 +73,7 @@
   },
   "dependencies": {
     "@times-components/article-list": "5.2.9",
-    "@times-components/context": "0.4.27",
+    "@times-components/context": "0.4.28",
     "@times-components/gradient": "2.1.36",
     "@times-components/icons": "2.2.28",
     "@times-components/image": "4.0.11",

diff --git a/packages/related-articles/fixtures/leadandtwo/1-article.js b/packages/related-articles/fixtures/leadandtwo/1-article.js
@@ -3,7 +3,8 @@ const defaultCrop169 =
 const defaultHeadline = "Defence of the Realm";
 const defaultShortHeadline = "Defence of the Realm";
 const defaultLabel = "leading article";
-const defaultSlug = "bayeux-tapestry-now-for-a-new-battle-bringing-fragile-masterpiece-to-britain-safely";
+const defaultSlug =
+  "bayeux-tapestry-now-for-a-new-battle-bringing-fragile-masterpiece-to-britain-safely";
 const defaultShortIdentifier = "2k629tpvh";
 const defaultSummary105 = [
   {

diff --git a/packages/related-articles/fixtures/leadandtwo/2-articles.js b/packages/related-articles/fixtures/leadandtwo/2-articles.js
@@ -269,7 +269,8 @@ const defaultSecondSummary225 = [
 const defaultSecondUrl =
   "https://www.uat-thetimes.co.uk/article/size-matters-so-ministers-must-prove-they-are-serious-about-defence-bhs0jnw6d";
 
-const defaultSlug = "bayeux-tapestry-now-for-a-new-battle-bringing-fragile-masterpiece-to-britain-safely";
+const defaultSlug =
+  "bayeux-tapestry-now-for-a-new-battle-bringing-fragile-masterpiece-to-britain-safely";
 const defaultShortIdentifier = "2k629tpvh";
 export default (
   {

diff --git a/packages/related-articles/fixtures/leadandtwo/3-articles.js b/packages/related-articles/fixtures/leadandtwo/3-articles.js
@@ -112,7 +112,8 @@ const defaultSecondHeadline = "Trident gets out of MoD budget, Hammond urged";
 const defaultSecondShortHeadline = "Trident gets out of MoD budget";
 const defaultSecondLabel = "defence cuts";
 const defaultSecondSection = "sport";
-const defaultSlug = "bayeux-tapestry-now-for-a-new-battle-bringing-fragile-masterpiece-to-britain-safely";
+const defaultSlug =
+  "bayeux-tapestry-now-for-a-new-battle-bringing-fragile-masterpiece-to-britain-safely";
 const defaultShortIdentifier = "2k629tpvh";
 const defaultSecondSummary105 = [
   {

diff --git a/packages/related-articles/fixtures/opinionandtwo/1-article.js b/packages/related-articles/fixtures/opinionandtwo/1-article.js
@@ -7,7 +7,8 @@ const defaultHeadline =
 const defaultShortHeadline = "Nothing proves Jeremy Corbyn is anti-semitic";
 const defaultLabel = "opinion";
 const defaultSection = "comment";
-const defaultSlug = "bayeux-tapestry-now-for-a-new-battle-bringing-fragile-masterpiece-to-britain-safely";
+const defaultSlug =
+  "bayeux-tapestry-now-for-a-new-battle-bringing-fragile-masterpiece-to-britain-safely";
 const defaultShortIdentifier = "2k629tpvh";
 const defaultSummary105 = [
   {

diff --git a/packages/related-articles/fixtures/opinionandtwo/2-articles.js b/packages/related-articles/fixtures/opinionandtwo/2-articles.js
@@ -263,7 +263,8 @@ const defaultSecondSummary225 = [
     ]
   }
 ];
-const defaultSlug = "bayeux-tapestry-now-for-a-new-battle-bringing-fragile-masterpiece-to-britain-safely";
+const defaultSlug =
+  "bayeux-tapestry-now-for-a-new-battle-bringing-fragile-masterpiece-to-britain-safely";
 const defaultShortIdentifier = "2k629tpvh";
 const defaultSecondUrl =
   "https://www.uat-thetimes.co.uk/article/size-matters-so-ministers-must-prove-they-are-serious-about-defence-bhs0jnw6d";

diff --git a/packages/related-articles/fixtures/opinionandtwo/3-articles.js b/packages/related-articles/fixtures/opinionandtwo/3-articles.js
@@ -6,7 +6,8 @@ const defaultFirstHeadline = "High score for labour in football club election";
 const defaultFirstShortHeadline = "High score for labour in football";
 const defaultFirstLabel = "opinion";
 const defaultFirstSection = "comment";
-const defaultSlug = "bayeux-tapestry-now-for-a-new-battle-bringing-fragile-masterpiece-to-britain-safely";
+const defaultSlug =
+  "bayeux-tapestry-now-for-a-new-battle-bringing-fragile-masterpiece-to-britain-safely";
 const defaultShortIdentifier = "2k629tpvh";
 const defaultFirstSummary105 = [
   {

diff --git a/packages/related-articles/fixtures/standard/1-article-no-byline.json b/packages/related-articles/fixtures/standard/1-article-no-byline.json
@@ -8,8 +8,9 @@
             "id": "08604618-fb0e-11e7-a987-7fcf5e9983dc",
             "headline":
               "Now for a new battle: bringing the fragile masterpiece over safely",
-            "slug":"bayeux-tapestry-now-for-a-new-battle-bringing-fragile-masterpiece-to-britain-safely",
-            "shortIdentifier":"2k629tpvh",
+            "slug":
+              "bayeux-tapestry-now-for-a-new-battle-bringing-fragile-masterpiece-to-britain-safely",
+            "shortIdentifier": "2k629tpvh",
             "shortHeadline": "Bringing the fragile masterpiece over safely",
             "section": "thedish",
             "summary105": [

diff --git a/packages/related-articles/fixtures/standard/1-article-no-image.json b/packages/related-articles/fixtures/standard/1-article-no-image.json
@@ -8,8 +8,9 @@
             "id": "18604618-fb0e-11e7-a987-7fcf5e9983dc",
             "headline":
               "Now for a new battle: bringing the fragile masterpiece over safely",
-            "slug":"bayeux-tapestry-now-for-a-new-battle-bringing-fragile-masterpiece-to-britain-safely",
-            "shortIdentifier":"2k629tpvh",
+            "slug":
+              "bayeux-tapestry-now-for-a-new-battle-bringing-fragile-masterpiece-to-britain-safely",
+            "shortIdentifier": "2k629tpvh",
             "shortHeadline": "Bringing the fragile masterpiece over safely",
             "section": "thedish",
             "summary105": [

diff --git a/packages/related-articles/fixtures/standard/1-article-no-label.json b/packages/related-articles/fixtures/standard/1-article-no-label.json
@@ -8,8 +8,9 @@
             "id": "28604618-fb0e-11e7-a987-7fcf5e9983dc",
             "headline":
               "Now for a new battle: bringing the fragile masterpiece over safely",
-            "slug":"bayeux-tapestry-now-for-a-new-battle-bringing-fragile-masterpiece-to-britain-safely",
-            "shortIdentifier":"2k629tpvh",
+            "slug":
+              "bayeux-tapestry-now-for-a-new-battle-bringing-fragile-masterpiece-to-britain-safely",
+            "shortIdentifier": "2k629tpvh",
             "shortHeadline": "Bringing the fragile masterpiece over safely",
             "section": "thedish",
             "summary105": [

diff --git a/packages/related-articles/fixtures/standard/1-article-video-lead.json b/packages/related-articles/fixtures/standard/1-article-video-lead.json
@@ -9,8 +9,9 @@
             "hasVideo": true,
             "headline":
               "Now for a new battle: bringing the fragile masterpiece over safely",
-            "slug":"bayeux-tapestry-now-for-a-new-battle-bringing-fragile-masterpiece-to-britain-safely",
-            "shortIdentifier":"2k629tpvh",
+            "slug":
+              "bayeux-tapestry-now-for-a-new-battle-bringing-fragile-masterpiece-to-britain-safely",
+            "shortIdentifier": "2k629tpvh",
             "shortHeadline": "Bringing the fragile masterpiece over safely",
             "section": "thedish",
             "summary105": [

diff --git a/packages/related-articles/fixtures/standard/1-article.js b/packages/related-articles/fixtures/standard/1-article.js
@@ -113,7 +113,8 @@ const defaultTitle =
 const defaultUrl =
   "https://www.thetimes.co.uk/article/bayeux-tapestry-now-for-a-new-battle-bringing-fragile-masterpiece-to-britain-safely-2k629tpvh";
 
-const defaultSlug = "bayeux-tapestry-now-for-a-new-battle-bringing-fragile-masterpiece-to-britain-safely";
+const defaultSlug =
+  "bayeux-tapestry-now-for-a-new-battle-bringing-fragile-masterpiece-to-britain-safely";
 const defaultShortIdentifier = "2k629tpvh";
 export default (
   {

diff --git a/packages/related-articles/fixtures/standard/2-articles.js b/packages/related-articles/fixtures/standard/2-articles.js
@@ -366,7 +366,8 @@ const defaultSecondSummary225 = [
 const defaultSecondUrl =
   "https://www.thetimes.co.uk/article/bayeux-tapestry-now-for-a-new-battle-bringing-fragile-masterpiece-to-britain-safely-2k629tpvh";
 
-const defaultSlug = "bayeux-tapestry-now-for-a-new-battle-bringing-fragile-masterpiece-to-britain-safely";
+const defaultSlug =
+  "bayeux-tapestry-now-for-a-new-battle-bringing-fragile-masterpiece-to-britain-safely";
 const defaultShortIdentifier = "2k629tpvh";
 
 export default (

diff --git a/packages/related-articles/fixtures/standard/3-articles.js b/packages/related-articles/fixtures/standard/3-articles.js
@@ -106,7 +106,8 @@ const defaultFirstTitle =
   "The tapestry has had a purpose-built home since 1983, having once been kept at Bayeux Cathedral";
 const defaultFirstUrl =
   "https://www.thetimes.co.uk/article/bayeux-tapestry-now-for-a-new-battle-bringing-fragile-masterpiece-to-britain-safely-2k629tpvh";
-const defaultSlug = "bayeux-tapestry-now-for-a-new-battle-bringing-fragile-masterpiece-to-britain-safely";
+const defaultSlug =
+  "bayeux-tapestry-now-for-a-new-battle-bringing-fragile-masterpiece-to-britain-safely";
 const defaultShortIdentifier = "2k629tpvh";
 const defaultSecondCrop169 =
   "https://www.thetimes.co.uk/imageserver/image/methode%2Ftimes%2Fprod%2Fweb%2Fbin%2F82723c10-fb7f-11e7-a987-7fcf5e9983dc.jpg?crop=4886%2C2748%2C92%2C108";

diff --git a/packages/topic/package.json b/packages/topic/package.json
@@ -69,7 +69,7 @@
     "webpack-cli": "2.1.4"
   },
   "dependencies": {
-    "@times-components/context": "0.4.27",
+    "@times-components/context": "0.4.28",
     "@times-components/article-list": "5.2.9",
     "@times-components/markup": "3.2.8",
     "@times-components/markup-forest": "1.0.6",