Merge branch 'master' into chore/TMP-1657/update-deck-data-api-endpoint

newsuk · Dec 2, 2024 · 48d6552 · 48d6552
2 parents 728e42a + 3c6b0e1
commit 48d6552
Show file tree

Hide file tree

Showing 425 changed files with 9,222 additions and 19,149 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
diff --git a/.gitignore b/.gitignore
@@ -21,6 +21,7 @@ DerivedData
 *.ipa
 *.xcuserstate
 project.xcworkspace
+.gradle
 
 # node.js
 #

diff --git a/.gradle/8.8/checksums/checksums.lock b/.gradle/8.8/checksums/checksums.lock
diff --git a/.gradle/8.8/dependencies-accessors/gc.properties b/.gradle/8.8/dependencies-accessors/gc.properties
diff --git a/.gradle/8.8/fileChanges/last-build.bin b/.gradle/8.8/fileChanges/last-build.bin
diff --git a/.gradle/8.8/fileHashes/fileHashes.bin b/.gradle/8.8/fileHashes/fileHashes.bin
diff --git a/.gradle/8.8/fileHashes/fileHashes.lock b/.gradle/8.8/fileHashes/fileHashes.lock
diff --git a/.gradle/8.8/gc.properties b/.gradle/8.8/gc.properties
diff --git a/.gradle/8.9/checksums/checksums.lock b/.gradle/8.9/checksums/checksums.lock
diff --git a/.gradle/8.9/dependencies-accessors/gc.properties b/.gradle/8.9/dependencies-accessors/gc.properties
diff --git a/.gradle/8.9/fileChanges/last-build.bin b/.gradle/8.9/fileChanges/last-build.bin
diff --git a/.gradle/8.9/fileHashes/fileHashes.lock b/.gradle/8.9/fileHashes/fileHashes.lock
diff --git a/.gradle/8.9/gc.properties b/.gradle/8.9/gc.properties
diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock
diff --git a/.gradle/buildOutputCleanup/cache.properties b/.gradle/buildOutputCleanup/cache.properties
@@ -0,0 +1,2 @@
+#Thu Sep 19 14:30:13 CEST 2024
+gradle.version=8.9
diff --git a/.gradle/vcs-1/gc.properties b/.gradle/vcs-1/gc.properties
diff --git a/.storybook/preview-head.html b/.storybook/preview-head.html
@@ -187,6 +187,13 @@
     font-display: swap;
   }
 
+  @font-face {
+    font-family: "Times Modern";
+    src: url(static/fonts/TimesModern-light.woff2) format("woff2");
+    font-style: normal;
+    font-weight: 300;
+    font-display: swap;
+  }
 
   @font-face {
     font-family: 'Times Modern';

diff --git a/.storybook/public/static/fonts/TimesModern-light.woff2 b/.storybook/public/static/fonts/TimesModern-light.woff2
diff --git a/README.md b/README.md
@@ -52,6 +52,8 @@ Any of these source files can be debugged directly.
 
 Follow these steps [here](https://github.com/newsuk/cps-content-render#integrating-with-times-components)
 
+You will also see the option to do a canary release in the pipeline, which will publish a test version of your changes that you can import in render.
+
 ## See your changes in Render with rnw.js files
 
 Besides linking the Times Components and Render repos together, you can view changes made to Times Components in Render through the rnw.js files.

diff --git a/lib/cypress-rerun.sh b/lib/cypress-rerun.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+#
+#  ===== Parallelism Script ======
+#
+#  Description: Check if arguments are passed correctly,create a test directory, add symbolic link and run the test command.
+#  Date:        Septemeber 2024
+#  Author:      [email protected]
+#  Team:        @tm-qa-engineers (QA team)
+#
+
+
+echo "Creating directory structure at './packages/ssr/test-results'..."
+mkdir -p "./packages/ssr/test-results"
+ln -s /home/circleci/project/node_modules/cypress-circleci-reporter "/home/circleci/project/packages/ssr/node_modules/cypress-circleci-reporter"
+echo "Running yarn command: yarn test:e2e:ci..."
+yarn test:e2e:ci
diff --git a/package.json b/package.json
@@ -46,11 +46,13 @@
     "test:unit": "lerna run test:unit --stream",
     "test:unit:updatesnapshot": "lerna run test:unit:updatesnapshot --stream",
     "test:e2e": "yarn bundle && lerna run test:integration --stream",
+    "test:e2e:ci": "yarn bundle && lerna run test:integration:ci --stream",
     "test:e2e:debug": "yarn bundle && lerna run test:integration:debug --stream",
     "lerna:publish:verdaccio": "yarn lerna publish --conventional-commits --concurrency=1  --registry=\"http://localhost:4873\" --no-verify-access --no-git-tag-version   --no-verify-registry --yes ",
     "verdaccio:start": "yarn verdaccio -c ./.verdaccio-config.yaml",
     "verdaccio:start:detached": "yarn pm2 start \"yarn verdaccio:start\"",
-    "watch": "lerna run watch --stream --no-sort --concurrency 100"
+    "watch": "lerna run watch --stream --no-sort --concurrency 100",
+    "stop:testserver": "kill $(lsof -t -i:3000)"
   },
   "jest": {
     "coveragePathIgnorePatterns": [
@@ -112,6 +114,7 @@
     "babel-plugin-transform-react-remove-prop-types": "0.4.24",
     "commitizen": "2.9.6",
     "coveralls": "2.13.1",
+    "cypress-circleci-reporter": "0.2.0",
     "cz-conventional-changelog": "2.1.0",
     "dashify": "0.2.2",
     "es6-promise-pool": "^2.5.0",
@@ -159,4 +162,4 @@
     "verdaccio": "5.26.2",
     "winston": "3.10.0"
   }
-}
+}
diff --git a/packages/article-byline/CHANGELOG.md b/packages/article-byline/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [3.13.56](https://github.com/newsuk/times-components/compare/@times-components/[email protected]...@times-components/[email protected]) (2024-10-18)
+
+**Note:** Version bump only for package @times-components/article-byline
+
+
+
+
+
 ## [3.13.55](https://github.com/newsuk/times-components/compare/@times-components/[email protected]...@times-components/[email protected]) (2024-07-02)
 
 **Note:** Version bump only for package @times-components/article-byline

diff --git a/packages/article-byline/package.json b/packages/article-byline/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@times-components/article-byline",
-  "version": "3.13.55",
+  "version": "3.13.56",
   "description": "Article byline information ",
   "main": "dist/article-byline",
   "dev": "src/article-byline",
@@ -53,7 +53,7 @@
   },
   "dependencies": {
     "@times-components/link": "3.17.34",
-    "@times-components/markup": "3.8.61",
+    "@times-components/markup": "3.9.0",
     "@times-components/markup-forest": "1.9.2",
     "@times-components/tracking": "2.22.34",
     "@times-components/ts-styleguide": "1.50.34",

diff --git a/packages/article-comments/CHANGELOG.md b/packages/article-comments/CHANGELOG.md
@@ -3,6 +3,209 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.44.23](https://github.com/newsuk/times-components/compare/@times-components/[email protected]...@times-components/[email protected]) (2024-11-22)
+
+**Note:** Version bump only for package @times-components/article-comments
+
+
+
+
+
+## [0.44.22](https://github.com/newsuk/times-components/compare/@times-components/[email protected]...@times-components/[email protected]) (2024-11-20)
+
+**Note:** Version bump only for package @times-components/article-comments
+
+
+
+
+
+## [0.44.21](https://github.com/newsuk/times-components/compare/@times-components/[email protected]...@times-components/[email protected]) (2024-11-05)
+
+**Note:** Version bump only for package @times-components/article-comments
+
+
+
+
+
+## [0.44.20](https://github.com/newsuk/times-components/compare/@times-components/[email protected]...@times-components/[email protected]) (2024-11-05)
+
+**Note:** Version bump only for package @times-components/article-comments
+
+
+
+
+
+## [0.44.19](https://github.com/newsuk/times-components/compare/@times-components/[email protected]...@times-components/[email protected]) (2024-10-28)
+
+**Note:** Version bump only for package @times-components/article-comments
+
+
+
+
+
+## [0.44.18](https://github.com/newsuk/times-components/compare/@times-components/[email protected]...@times-components/[email protected]) (2024-10-28)
+
+**Note:** Version bump only for package @times-components/article-comments
+
+
+
+
+
+## [0.44.17](https://github.com/newsuk/times-components/compare/@times-components/[email protected]...@times-components/[email protected]) (2024-10-23)
+
+**Note:** Version bump only for package @times-components/article-comments
+
+
+
+
+
+## [0.44.16](https://github.com/newsuk/times-components/compare/@times-components/[email protected]...@times-components/[email protected]) (2024-10-18)
+
+**Note:** Version bump only for package @times-components/article-comments
+
+
+
+
+
+## [0.44.15](https://github.com/newsuk/times-components/compare/@times-components/[email protected]...@times-components/[email protected]) (2024-10-18)
+
+**Note:** Version bump only for package @times-components/article-comments
+
+
+
+
+
+## [0.44.14](https://github.com/newsuk/times-components/compare/@times-components/[email protected]...@times-components/[email protected]) (2024-10-17)
+
+**Note:** Version bump only for package @times-components/article-comments
+
+
+
+
+
+## [0.44.13](https://github.com/newsuk/times-components/compare/@times-components/[email protected]...@times-components/[email protected]) (2024-10-15)
+
+**Note:** Version bump only for package @times-components/article-comments
+
+
+
+
+
+## [0.44.12](https://github.com/newsuk/times-components/compare/@times-components/[email protected]...@times-components/[email protected]) (2024-10-15)
+
+**Note:** Version bump only for package @times-components/article-comments
+
+
+
+
+
+## [0.44.11](https://github.com/newsuk/times-components/compare/@times-components/[email protected]...@times-components/[email protected]) (2024-10-14)
+
+**Note:** Version bump only for package @times-components/article-comments
+
+
+
+
+
+## [0.44.10](https://github.com/newsuk/times-components/compare/@times-components/[email protected]...@times-components/[email protected]) (2024-09-30)
+
+**Note:** Version bump only for package @times-components/article-comments
+
+
+
+
+
+## [0.44.9](https://github.com/newsuk/times-components/compare/@times-components/[email protected]...@times-components/[email protected]) (2024-09-16)
+
+**Note:** Version bump only for package @times-components/article-comments
+
+
+
+
+
+## [0.44.8](https://github.com/newsuk/times-components/compare/@times-components/[email protected]...@times-components/[email protected]) (2024-09-06)
+
+**Note:** Version bump only for package @times-components/article-comments
+
+
+
+
+
+## [0.44.7](https://github.com/newsuk/times-components/compare/@times-components/[email protected]...@times-components/[email protected]) (2024-08-28)
+
+**Note:** Version bump only for package @times-components/article-comments
+
+
+
+
+
+## [0.44.6](https://github.com/newsuk/times-components/compare/@times-components/[email protected]...@times-components/[email protected]) (2024-08-28)
+
+**Note:** Version bump only for package @times-components/article-comments
+
+
+
+
+
+## [0.44.5](https://github.com/newsuk/times-components/compare/@times-components/[email protected]...@times-components/[email protected]) (2024-08-28)
+
+**Note:** Version bump only for package @times-components/article-comments
+
+
+
+
+
+## [0.44.4](https://github.com/newsuk/times-components/compare/@times-components/[email protected]...@times-components/[email protected]) (2024-08-23)
+
+**Note:** Version bump only for package @times-components/article-comments
+
+
+
+
+
+## [0.44.3](https://github.com/newsuk/times-components/compare/@times-components/[email protected]...@times-components/[email protected]) (2024-08-22)
+
+**Note:** Version bump only for package @times-components/article-comments
+
+
+
+
+
+## [0.44.2](https://github.com/newsuk/times-components/compare/@times-components/[email protected]...@times-components/[email protected]) (2024-08-14)
+
+**Note:** Version bump only for package @times-components/article-comments
+
+
+
+
+
+## [0.44.1](https://github.com/newsuk/times-components/compare/@times-components/[email protected]...@times-components/[email protected]) (2024-08-08)
+
+**Note:** Version bump only for package @times-components/article-comments
+
+
+
+
+
+# [0.44.0](https://github.com/newsuk/times-components/compare/@times-components/[email protected]...@times-components/[email protected]) (2024-08-08)
+
+
+### Features
+
+* **TMG-1729:** test-integrated commenting with internal cps endpoint ([#3910](https://github.com/newsuk/times-components/issues/3910)) ([7a4958d](https://github.com/newsuk/times-components/commit/7a4958db25785ecb068e0ab2d29fc0295bc8358f))
+
+
+
+
+
+## [0.43.28](https://github.com/newsuk/times-components/compare/@times-components/[email protected]...@times-components/[email protected]) (2024-08-08)
+
+**Note:** Version bump only for package @times-components/article-comments
+
+
+
+
+
 ## [0.43.27](https://github.com/newsuk/times-components/compare/@times-components/[email protected]...@times-components/[email protected]) (2024-07-15)
 
 **Note:** Version bump only for package @times-components/article-comments

diff --git a/packages/article-comments/package.json b/packages/article-comments/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@times-components/article-comments",
-  "version": "0.43.27",
+  "version": "0.44.23",
   "description": "Article Comments",
   "main": "dist/article-comments",
   "dev": "src/article-comments",
@@ -35,7 +35,7 @@
   "dependencies": {
     "@times-components/link": "3.17.34",
     "@times-components/tracking": "2.22.34",
-    "@times-components/ts-components": "1.98.2",
+    "@times-components/ts-components": "1.111.0",
     "@times-components/ts-styleguide": "1.50.34",
     "@times-components/user-state": "0.5.51",
     "prop-types": "15.7.2",
-Original file line number
+Diff line change
@@ Expand Up / @@ -21,6 +21,7 @@ DerivedData @@
     *.ipa
     *.xcuserstate
     project.xcworkspace
+    .gradle
     # node.js
     #
@@ Expand Down @@
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		#Thu Sep 19 14:30:13 CEST 2024
		gradle.version=8.9