From eb1900e4b8a4b2b5c2607a1f012bc63560fa1b8c Mon Sep 17 00:00:00 2001 From: DanielCliftonGuardian <110032454+DanielCliftonGuardian@users.noreply.github.com> Date: Thu, 14 Nov 2024 18:15:45 +0000 Subject: [PATCH 01/12] WIP --- .../controllers/CrosswordsController.scala | 46 ++++++++++++++----- applications/conf/routes | 1 + .../EditionsCrosswordRenderingDataModel.scala | 40 ++++++++++++++++ 3 files changed, 75 insertions(+), 12 deletions(-) create mode 100644 common/app/model/dotcomrendering/pageElements/EditionsCrosswordRenderingDataModel.scala diff --git a/applications/app/controllers/CrosswordsController.scala b/applications/app/controllers/CrosswordsController.scala index 41e2757662d..fe995c681f9 100644 --- a/applications/app/controllers/CrosswordsController.scala +++ b/applications/app/controllers/CrosswordsController.scala @@ -1,19 +1,13 @@ package controllers +import com.gu.contentapi.client.model.v1.Content.unsafeEmpty.crossword +import com.gu.contentapi.client.model.v1.CrosswordType.{Cryptic, Quick} import com.gu.contentapi.client.model.v1.{Crossword, ItemResponse, Content => ApiContent, Section => ApiSection} import common.{Edition, GuLogging, ImplicitControllerExecutionContext} import conf.Static import contentapi.ContentApiClient import pages.{CrosswordHtmlPage, IndexHtmlPage, PrintableCrosswordHtmlPage} -import crosswords.{ - AccessibleCrosswordPage, - AccessibleCrosswordRows, - CrosswordPageWithContent, - CrosswordPageWithSvg, - CrosswordSearchPageNoResult, - CrosswordSearchPageWithResults, - CrosswordSvg, -} +import crosswords.{AccessibleCrosswordPage, AccessibleCrosswordRows, CrosswordPageWithContent, CrosswordPageWithSvg, CrosswordSearchPageNoResult, CrosswordSearchPageWithResults, CrosswordSvg} import model.Cached.{RevalidatableResult, WithoutRevalidationResult} import model._ import org.joda.time.{DateTime, LocalDate} @@ -22,6 +16,8 @@ import play.api.data._ import play.api.mvc.{Action, RequestHeader, Result, _} import services.{IndexPage, IndexPageItem} import html.HtmlPageHelpers.ContentCSSFile +import model.dotcomrendering.pageElements.EditionsCrosswordRenderingDataModel +import model.dotcomrendering.pageElements.EditionsCrosswordRenderingDataModel.toJson import model.dotcomrendering.{DotcomRenderingDataModel, PageType} import play.api.libs.ws.WSClient import renderers.DotcomRenderingService @@ -290,11 +286,12 @@ class CrosswordSearchController( case class CrosswordLookup(crosswordType: String, id: Int) } -class CrosswordEditionsController(val controllerComponents: ControllerComponents) - extends BaseController +class CrosswordEditionsController( + val contentApiClient: ContentApiClient, + val controllerComponents: ControllerComponents, +) extends BaseController with GuLogging with ImplicitControllerExecutionContext { - def digitalEdition: Action[AnyContent] = Action.async { implicit request => Future.successful( @@ -303,4 +300,29 @@ class CrosswordEditionsController(val controllerComponents: ControllerComponents ), ) } + + def getCrosswords: Action[AnyContent] = Action.async { implicit request => + contentApiClient + .getResponse( + contentApiClient.item(s"crosswords"), + ) + .flatMap { response => + val crosswords = for { + results <- response.results + quick <- results.find(_.crossword.exists(_.`type` == Quick)).flatMap(_.crossword) + cryptic <- results.find(_.crossword.exists(_.`type` == Cryptic)).flatMap(_.crossword) + } yield (quick, cryptic) + + crosswords match { + case Some((quick, cryptic)) => + val crosswordPage = EditionsCrosswordRenderingDataModel(quick, cryptic) + Future.successful( + Cached(CacheTime.Default)( + RevalidatableResult.Ok(toJson(crosswordPage)), + ).as("application/json"), + ) + case None => Future.successful(NotFound) + } + } + } } diff --git a/applications/conf/routes b/applications/conf/routes index e17e9272bd6..5de2e9ee519 100644 --- a/applications/conf/routes +++ b/applications/conf/routes @@ -29,6 +29,7 @@ GET /crosswords/lookup # Crosswords digital edition GET /crosswords/digital-edition controllers.CrosswordEditionsController.digitalEdition +GET /crosswordtest controllers.CrosswordEditionsController.getCrosswords # Email paths GET /email/form/$emailType/$listId<[0-9]+> controllers.EmailSignupController.renderForm(emailType: String, listId: Int) diff --git a/common/app/model/dotcomrendering/pageElements/EditionsCrosswordRenderingDataModel.scala b/common/app/model/dotcomrendering/pageElements/EditionsCrosswordRenderingDataModel.scala new file mode 100644 index 00000000000..4a568b7edf7 --- /dev/null +++ b/common/app/model/dotcomrendering/pageElements/EditionsCrosswordRenderingDataModel.scala @@ -0,0 +1,40 @@ +package model.dotcomrendering.pageElements + +import com.gu.contentapi.client.model.v1.Crossword +import model.dotcomrendering.DotcomRenderingDataModel +import model.dotcomrendering.DotcomRenderingUtils.withoutNull +import org.apache.thrift.protocol.TSimpleJSONProtocol +import org.apache.thrift.transport.TIOStreamTransport +import play.api.libs.json.{JsValue, Json, OWrites, Writes} + +case class EditionsCrosswordRenderingDataModel( + quick: Crossword, + cryptic: Crossword, +) + +object EditionsCrosswordRenderingDataModel { + // we Json.parse this into a JsValue to ensure we get the raw JSON + // from the Content API rather than a Json.stringified version + private def contentApiToJsonValue(crossword: Crossword): JsValue = { + val protocolFactory = new TSimpleJSONProtocol.Factory + + val buffer = new java.io.ByteArrayOutputStream + val protocol = protocolFactory.getProtocol(new TIOStreamTransport(buffer)) + + Crossword.encode(crossword, protocol) + Json.parse(new String(buffer.toByteArray, "UTF-8")) + } + implicit val writes: Writes[EditionsCrosswordRenderingDataModel] = + new Writes[EditionsCrosswordRenderingDataModel] { + def writes(model: EditionsCrosswordRenderingDataModel) = { + Json.obj( + "quick" -> contentApiToJsonValue(model.quick), + "cryptic" -> contentApiToJsonValue(model.cryptic), + ) + } + } + def toJson(model: EditionsCrosswordRenderingDataModel): String = { + val jsValue = Json.toJson(model) + Json.stringify(withoutNull(jsValue)) + } +} From d6001625b0dfd7ee1aebcb8685f6030906f0b235 Mon Sep 17 00:00:00 2001 From: DanielCliftonGuardian <110032454+DanielCliftonGuardian@users.noreply.github.com> Date: Fri, 15 Nov 2024 13:12:08 +0000 Subject: [PATCH 02/12] Add to DCR service --- .../app/controllers/CrosswordsController.scala | 13 ++++++++++++- applications/conf/routes | 3 +-- build.sbt | 1 + .../EditionsCrosswordRenderingDataModel.scala | 15 ++++----------- common/app/renderers/DotcomRenderingService.scala | 13 ++++++++++++- project/Dependencies.scala | 1 + 6 files changed, 31 insertions(+), 15 deletions(-) diff --git a/applications/app/controllers/CrosswordsController.scala b/applications/app/controllers/CrosswordsController.scala index fe995c681f9..9d170e53d2b 100644 --- a/applications/app/controllers/CrosswordsController.scala +++ b/applications/app/controllers/CrosswordsController.scala @@ -7,7 +7,15 @@ import common.{Edition, GuLogging, ImplicitControllerExecutionContext} import conf.Static import contentapi.ContentApiClient import pages.{CrosswordHtmlPage, IndexHtmlPage, PrintableCrosswordHtmlPage} -import crosswords.{AccessibleCrosswordPage, AccessibleCrosswordRows, CrosswordPageWithContent, CrosswordPageWithSvg, CrosswordSearchPageNoResult, CrosswordSearchPageWithResults, CrosswordSvg} +import crosswords.{ + AccessibleCrosswordPage, + AccessibleCrosswordRows, + CrosswordPageWithContent, + CrosswordPageWithSvg, + CrosswordSearchPageNoResult, + CrosswordSearchPageWithResults, + CrosswordSvg, +} import model.Cached.{RevalidatableResult, WithoutRevalidationResult} import model._ import org.joda.time.{DateTime, LocalDate} @@ -289,6 +297,8 @@ class CrosswordSearchController( class CrosswordEditionsController( val contentApiClient: ContentApiClient, val controllerComponents: ControllerComponents, + val remoteRenderer: DotcomRenderingService = DotcomRenderingService(), + val wsClient: WSClient, ) extends BaseController with GuLogging with ImplicitControllerExecutionContext { @@ -316,6 +326,7 @@ class CrosswordEditionsController( crosswords match { case Some((quick, cryptic)) => val crosswordPage = EditionsCrosswordRenderingDataModel(quick, cryptic) + remoteRenderer.getEditionsCrossword(wsClient, quick, cryptic) Future.successful( Cached(CacheTime.Default)( RevalidatableResult.Ok(toJson(crosswordPage)), diff --git a/applications/conf/routes b/applications/conf/routes index 5de2e9ee519..2c0e804f64b 100644 --- a/applications/conf/routes +++ b/applications/conf/routes @@ -29,8 +29,7 @@ GET /crosswords/lookup # Crosswords digital edition GET /crosswords/digital-edition controllers.CrosswordEditionsController.digitalEdition -GET /crosswordtest controllers.CrosswordEditionsController.getCrosswords - +GET /crosswordtest controllers.CrosswordEditionsController.getCrosswords # Email paths GET /email/form/$emailType/$listId<[0-9]+> controllers.EmailSignupController.renderForm(emailType: String, listId: Int) GET /email/form/$emailType/:listName controllers.EmailSignupController.renderFormFromName(emailType: String, listName: String) diff --git a/build.sbt b/build.sbt index 611392947a1..afc1bac4d01 100644 --- a/build.sbt +++ b/build.sbt @@ -31,6 +31,7 @@ val common = library("common") eTagCachingS3, nettyCodecHttp2, contentApiClient, + contentApiModelsJson, enumeratumPlayJson, filters, commonsLang, diff --git a/common/app/model/dotcomrendering/pageElements/EditionsCrosswordRenderingDataModel.scala b/common/app/model/dotcomrendering/pageElements/EditionsCrosswordRenderingDataModel.scala index 4a568b7edf7..11e938a0235 100644 --- a/common/app/model/dotcomrendering/pageElements/EditionsCrosswordRenderingDataModel.scala +++ b/common/app/model/dotcomrendering/pageElements/EditionsCrosswordRenderingDataModel.scala @@ -1,11 +1,10 @@ package model.dotcomrendering.pageElements import com.gu.contentapi.client.model.v1.Crossword -import model.dotcomrendering.DotcomRenderingDataModel import model.dotcomrendering.DotcomRenderingUtils.withoutNull -import org.apache.thrift.protocol.TSimpleJSONProtocol -import org.apache.thrift.transport.TIOStreamTransport -import play.api.libs.json.{JsValue, Json, OWrites, Writes} +import play.api.libs.json.{JsValue, Json, Writes} +import com.gu.contentapi.json.CirceEncoders._ +import io.circe.syntax._ case class EditionsCrosswordRenderingDataModel( quick: Crossword, @@ -16,13 +15,7 @@ object EditionsCrosswordRenderingDataModel { // we Json.parse this into a JsValue to ensure we get the raw JSON // from the Content API rather than a Json.stringified version private def contentApiToJsonValue(crossword: Crossword): JsValue = { - val protocolFactory = new TSimpleJSONProtocol.Factory - - val buffer = new java.io.ByteArrayOutputStream - val protocol = protocolFactory.getProtocol(new TIOStreamTransport(buffer)) - - Crossword.encode(crossword, protocol) - Json.parse(new String(buffer.toByteArray, "UTF-8")) + Json.parse(crossword.asJson.toString()) } implicit val writes: Writes[EditionsCrosswordRenderingDataModel] = new Writes[EditionsCrosswordRenderingDataModel] { diff --git a/common/app/renderers/DotcomRenderingService.scala b/common/app/renderers/DotcomRenderingService.scala index d9cf9b59e0a..5b8ce3b78bd 100644 --- a/common/app/renderers/DotcomRenderingService.scala +++ b/common/app/renderers/DotcomRenderingService.scala @@ -1,7 +1,7 @@ package renderers import org.apache.pekko.actor.{ActorSystem => PekkoActorSystem} -import com.gu.contentapi.client.model.v1.{Block, Blocks, Content} +import com.gu.contentapi.client.model.v1.{Block, Blocks, Content, Crossword} import common.{DCRMetrics, GuLogging} import concurrent.CircuitBreakerRegistry import conf.Configuration @@ -10,6 +10,7 @@ import crosswords.CrosswordPageWithContent import http.{HttpPreconnections, ResultWithPreconnectPreload} import model.Cached.{RevalidatableResult, WithoutRevalidationResult} import model.dotcomrendering._ +import model.dotcomrendering.pageElements.EditionsCrosswordRenderingDataModel import model.{ CacheTime, Cached, @@ -417,6 +418,16 @@ class DotcomRenderingService extends GuLogging with ResultWithPreconnectPreload val json = DotcomRenderingDataModel.toJson(dataModel) post(ws, json, Configuration.rendering.articleBaseURL + "/Article", CacheTime.Facia) } + + def getEditionsCrossword( + ws: WSClient, + quickCrossword: Crossword, + crypticCrossword: Crossword, + )(implicit request: RequestHeader): Future[Result] = { + val dataModel = EditionsCrosswordRenderingDataModel(quickCrossword, crypticCrossword) + val json = EditionsCrosswordRenderingDataModel.toJson(dataModel) + post(ws, json, Configuration.rendering.articleBaseURL + "/EditionsCrossword", CacheTime.Facia) + } } object DotcomRenderingService { diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 29751049d28..e9ea26293b8 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -32,6 +32,7 @@ object Dependencies { val commonsIo = "commons-io" % "commons-io" % "2.16.1" val cssParser = "net.sourceforge.cssparser" % "cssparser" % "0.9.30" val contentApiClient = "com.gu" %% "content-api-client" % capiVersion + val contentApiModelsJson = "com.gu" %% "content-api-models-json" % "25.1.0" val dfpAxis = "com.google.api-ads" % "dfp-axis" % "5.6.0" val faciaFapiScalaClient = "com.gu" %% "fapi-client-play30" % faciaVersion val identityCookie = "com.gu.identity" %% "identity-cookie" % identityLibVersion From 115f994fbee5e0c4f2f0802e0e15c7ddd6ecb32e Mon Sep 17 00:00:00 2001 From: DanielCliftonGuardian <110032454+DanielCliftonGuardian@users.noreply.github.com> Date: Fri, 15 Nov 2024 16:59:29 +0000 Subject: [PATCH 03/12] Send to dcr --- .../controllers/CrosswordsController.scala | 49 +++++++------------ applications/conf/routes | 2 +- .../EditionsCrosswordRenderingDataModel.scala | 23 ++------- .../renderers/DotcomRenderingService.scala | 6 +-- 4 files changed, 26 insertions(+), 54 deletions(-) diff --git a/applications/app/controllers/CrosswordsController.scala b/applications/app/controllers/CrosswordsController.scala index 9d170e53d2b..3b52eadc9e5 100644 --- a/applications/app/controllers/CrosswordsController.scala +++ b/applications/app/controllers/CrosswordsController.scala @@ -302,38 +302,25 @@ class CrosswordEditionsController( ) extends BaseController with GuLogging with ImplicitControllerExecutionContext { - def digitalEdition: Action[AnyContent] = - Action.async { implicit request => - Future.successful( - Cached(CacheTime.Default)( - RevalidatableResult.Ok("Digital Edition Crossword Entry Point"), - ), - ) - } - def getCrosswords: Action[AnyContent] = Action.async { implicit request => - contentApiClient - .getResponse( - contentApiClient.item(s"crosswords"), - ) - .flatMap { response => - val crosswords = for { - results <- response.results - quick <- results.find(_.crossword.exists(_.`type` == Quick)).flatMap(_.crossword) - cryptic <- results.find(_.crossword.exists(_.`type` == Cryptic)).flatMap(_.crossword) - } yield (quick, cryptic) - - crosswords match { - case Some((quick, cryptic)) => - val crosswordPage = EditionsCrosswordRenderingDataModel(quick, cryptic) - remoteRenderer.getEditionsCrossword(wsClient, quick, cryptic) - Future.successful( - Cached(CacheTime.Default)( - RevalidatableResult.Ok(toJson(crosswordPage)), - ).as("application/json"), - ) - case None => Future.successful(NotFound) - } + def digitalEdition: Action[AnyContent] = Action.async { implicit request => + getCrosswords + .map(parseCrosswords) + .flatMap { + case Some(crosswordPage) => + remoteRenderer.getEditionsCrossword(wsClient, crosswordPage) + case None => Future.successful(NotFound) } } + + private lazy val crosswordsQuery = contentApiClient.item("crosswords") + + private def getCrosswords: Future[ItemResponse] = contentApiClient.getResponse(crosswordsQuery) + + private def parseCrosswords(response: ItemResponse): Option[EditionsCrosswordRenderingDataModel] = + for { + results <- response.results + quick <- results.find(_.crossword.exists(_.`type` == Quick)).flatMap(_.crossword) + cryptic <- results.find(_.crossword.exists(_.`type` == Cryptic)).flatMap(_.crossword) + } yield EditionsCrosswordRenderingDataModel(quick, cryptic) } diff --git a/applications/conf/routes b/applications/conf/routes index 2c0e804f64b..e17e9272bd6 100644 --- a/applications/conf/routes +++ b/applications/conf/routes @@ -29,7 +29,7 @@ GET /crosswords/lookup # Crosswords digital edition GET /crosswords/digital-edition controllers.CrosswordEditionsController.digitalEdition -GET /crosswordtest controllers.CrosswordEditionsController.getCrosswords + # Email paths GET /email/form/$emailType/$listId<[0-9]+> controllers.EmailSignupController.renderForm(emailType: String, listId: Int) GET /email/form/$emailType/:listName controllers.EmailSignupController.renderFormFromName(emailType: String, listName: String) diff --git a/common/app/model/dotcomrendering/pageElements/EditionsCrosswordRenderingDataModel.scala b/common/app/model/dotcomrendering/pageElements/EditionsCrosswordRenderingDataModel.scala index 11e938a0235..92cfff9ec8a 100644 --- a/common/app/model/dotcomrendering/pageElements/EditionsCrosswordRenderingDataModel.scala +++ b/common/app/model/dotcomrendering/pageElements/EditionsCrosswordRenderingDataModel.scala @@ -1,9 +1,8 @@ package model.dotcomrendering.pageElements import com.gu.contentapi.client.model.v1.Crossword -import model.dotcomrendering.DotcomRenderingUtils.withoutNull -import play.api.libs.json.{JsValue, Json, Writes} import com.gu.contentapi.json.CirceEncoders._ +import io.circe.JsonObject import io.circe.syntax._ case class EditionsCrosswordRenderingDataModel( @@ -12,22 +11,10 @@ case class EditionsCrosswordRenderingDataModel( ) object EditionsCrosswordRenderingDataModel { - // we Json.parse this into a JsValue to ensure we get the raw JSON - // from the Content API rather than a Json.stringified version - private def contentApiToJsonValue(crossword: Crossword): JsValue = { - Json.parse(crossword.asJson.toString()) - } - implicit val writes: Writes[EditionsCrosswordRenderingDataModel] = - new Writes[EditionsCrosswordRenderingDataModel] { - def writes(model: EditionsCrosswordRenderingDataModel) = { - Json.obj( - "quick" -> contentApiToJsonValue(model.quick), - "cryptic" -> contentApiToJsonValue(model.cryptic), - ) - } - } def toJson(model: EditionsCrosswordRenderingDataModel): String = { - val jsValue = Json.toJson(model) - Json.stringify(withoutNull(jsValue)) + JsonObject( + "quick" -> model.quick.asJson.dropNullValues, + "cryptic" -> model.cryptic.asJson.dropNullValues, + ).asJson.dropNullValues.noSpaces } } diff --git a/common/app/renderers/DotcomRenderingService.scala b/common/app/renderers/DotcomRenderingService.scala index 5b8ce3b78bd..36aabed2010 100644 --- a/common/app/renderers/DotcomRenderingService.scala +++ b/common/app/renderers/DotcomRenderingService.scala @@ -421,11 +421,9 @@ class DotcomRenderingService extends GuLogging with ResultWithPreconnectPreload def getEditionsCrossword( ws: WSClient, - quickCrossword: Crossword, - crypticCrossword: Crossword, + crosswords: EditionsCrosswordRenderingDataModel, )(implicit request: RequestHeader): Future[Result] = { - val dataModel = EditionsCrosswordRenderingDataModel(quickCrossword, crypticCrossword) - val json = EditionsCrosswordRenderingDataModel.toJson(dataModel) + val json = EditionsCrosswordRenderingDataModel.toJson(crosswords) post(ws, json, Configuration.rendering.articleBaseURL + "/EditionsCrossword", CacheTime.Facia) } } From e68afe66d0fca26292402c2ae9f191ecf444b0a4 Mon Sep 17 00:00:00 2001 From: Demetrios Skamiotis Date: Mon, 18 Nov 2024 19:29:21 +0000 Subject: [PATCH 04/12] add gpid prebid switch --- common/app/conf/switches/ABTestSwitches.scala | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/common/app/conf/switches/ABTestSwitches.scala b/common/app/conf/switches/ABTestSwitches.scala index d5345240965..4242553405b 100644 --- a/common/app/conf/switches/ABTestSwitches.scala +++ b/common/app/conf/switches/ABTestSwitches.scala @@ -70,4 +70,14 @@ trait ABTestSwitches { exposeClientSide = true, highImpact = false, ) + Switch( + ABTests, + "ab-gpid-prebid-ad-units", + "Test new GPID prebid ad units", + owners = Seq(Owner.withEmail("commercial.dev@theguardian.com")), + safeState = Off, + sellByDate = Some(LocalDate.of(2024, 12, 18)), + exposeClientSide = true, + highImpact = false, + ) } From 2bf747b0b2eba6adf114a7f85ec4b38bd3d2f043 Mon Sep 17 00:00:00 2001 From: Dina Hafez Date: Tue, 19 Nov 2024 14:27:36 +0000 Subject: [PATCH 05/12] Bump commercial v23.6.0 --- package.json | 2 +- yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index f15df016723..7da5dd2f023 100644 --- a/package.json +++ b/package.json @@ -28,7 +28,7 @@ "@emotion/react": "11.11.1", "@emotion/styled": "^10.0.27", "@guardian/ab-core": "8.0.0", - "@guardian/commercial": "23.5.0", + "@guardian/commercial": "23.6.0", "@guardian/core-web-vitals": "6.0.0", "@guardian/eslint-config-typescript": "9.0.1", "@guardian/identity-auth": "3.0.0", diff --git a/yarn.lock b/yarn.lock index ce0e6ce1486..1f41119e4f8 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3843,9 +3843,9 @@ __metadata: languageName: node linkType: hard -"@guardian/commercial@npm:23.5.0": - version: 23.5.0 - resolution: "@guardian/commercial@npm:23.5.0" +"@guardian/commercial@npm:23.6.0": + version: 23.6.0 + resolution: "@guardian/commercial@npm:23.6.0" dependencies: "@changesets/cli": "npm:^2.26.2" "@guardian/prebid.js": "npm:8.52.0-8" @@ -3863,7 +3863,7 @@ __metadata: "@guardian/libs": ^19.1.0 "@guardian/source": ^8.0.0 typescript: ~5.5.3 - checksum: 10c0/cd2249546d1f8d9e6fd3962a2975a7b97577206c31d6cdc635580dc09a85018a393a0e3d5bb295ccbc59c6331f691f5c340af8b76cd1c1ce417970490dca2b29 + checksum: 10c0/787aefe08049b037a02583e2c040a65c220662e83bd7e98d922a79f64847af50fb2dd77262bf382f6710d81e4ad0410a6c0cc3bcd33ad47bcff72f3eaad9409e languageName: node linkType: hard @@ -3936,7 +3936,7 @@ __metadata: "@emotion/react": "npm:11.11.1" "@emotion/styled": "npm:^10.0.27" "@guardian/ab-core": "npm:8.0.0" - "@guardian/commercial": "npm:23.5.0" + "@guardian/commercial": "npm:23.6.0" "@guardian/core-web-vitals": "npm:6.0.0" "@guardian/eslint-config-typescript": "npm:9.0.1" "@guardian/identity-auth": "npm:3.0.0" From dafe946de45c943521b71703fa283fe379ac3355 Mon Sep 17 00:00:00 2001 From: Simon Adcock Date: Wed, 20 Nov 2024 09:27:46 +0000 Subject: [PATCH 06/12] Revert "Add verification for bluesky" --- facia/conf/routes | 2 -- facia/public/atproto-did.txt | 1 - 2 files changed, 3 deletions(-) delete mode 100644 facia/public/atproto-did.txt diff --git a/facia/conf/routes b/facia/conf/routes index 035c804942b..22d16eda78d 100644 --- a/facia/conf/routes +++ b/facia/conf/routes @@ -18,8 +18,6 @@ GET /.well-known/security.txt.asc GET /.well-known/amphtml/apikey.pub controllers.FaciaController.ampRsaPublicKey() -GET /.well-known/atproto-did controllers.Assets.at(path="/public", file="atproto-did.txt") - # AMP GET /container/count/:count/offset/:offset/mf2.json controllers.FaciaController.renderSomeFrontContainersMf2(count: Int, offset: Int, section = "") GET /container/count/:count/offset/:offset/section/:section/mf2.json controllers.FaciaController.renderSomeFrontContainersMf2(count: Int, offset: Int, section) diff --git a/facia/public/atproto-did.txt b/facia/public/atproto-did.txt deleted file mode 100644 index d11ef8d9030..00000000000 --- a/facia/public/atproto-did.txt +++ /dev/null @@ -1 +0,0 @@ -did:plc:vovinwhtulbsx4mwfw26r5ni From d4d763adc52524fb0fd941c608e18ecdc8eb639f Mon Sep 17 00:00:00 2001 From: Jake Date: Wed, 20 Nov 2024 10:51:55 +0000 Subject: [PATCH 07/12] Bump commercial to 23.7.0 #27626 --- package.json | 2 +- yarn.lock | 1039 +------------------------------------------------- 2 files changed, 21 insertions(+), 1020 deletions(-) diff --git a/package.json b/package.json index 7da5dd2f023..baf711b3f15 100644 --- a/package.json +++ b/package.json @@ -28,7 +28,7 @@ "@emotion/react": "11.11.1", "@emotion/styled": "^10.0.27", "@guardian/ab-core": "8.0.0", - "@guardian/commercial": "23.6.0", + "@guardian/commercial": "23.7.0", "@guardian/core-web-vitals": "6.0.0", "@guardian/eslint-config-typescript": "9.0.1", "@guardian/identity-auth": "3.0.0", diff --git a/yarn.lock b/yarn.lock index 7e952ab472f..5c17a2afecf 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3092,7 +3092,7 @@ __metadata: languageName: node linkType: hard -"@babel/runtime@npm:^7.12.5, @babel/runtime@npm:^7.18.3, @babel/runtime@npm:^7.18.9, @babel/runtime@npm:^7.20.1, @babel/runtime@npm:^7.20.7, @babel/runtime@npm:^7.5.5, @babel/runtime@npm:^7.7.2, @babel/runtime@npm:^7.8.4": +"@babel/runtime@npm:^7.12.5, @babel/runtime@npm:^7.18.3, @babel/runtime@npm:^7.18.9, @babel/runtime@npm:^7.20.7, @babel/runtime@npm:^7.5.5, @babel/runtime@npm:^7.7.2, @babel/runtime@npm:^7.8.4": version: 7.24.5 resolution: "@babel/runtime@npm:7.24.5" dependencies: @@ -3200,242 +3200,6 @@ __metadata: languageName: node linkType: hard -"@changesets/apply-release-plan@npm:^6.1.4": - version: 6.1.4 - resolution: "@changesets/apply-release-plan@npm:6.1.4" - dependencies: - "@babel/runtime": "npm:^7.20.1" - "@changesets/config": "npm:^2.3.1" - "@changesets/get-version-range-type": "npm:^0.3.2" - "@changesets/git": "npm:^2.0.0" - "@changesets/types": "npm:^5.2.1" - "@manypkg/get-packages": "npm:^1.1.3" - detect-indent: "npm:^6.0.0" - fs-extra: "npm:^7.0.1" - lodash.startcase: "npm:^4.4.0" - outdent: "npm:^0.5.0" - prettier: "npm:^2.7.1" - resolve-from: "npm:^5.0.0" - semver: "npm:^7.5.3" - checksum: 10c0/880f0980965df33875f1152e991fe1b3f54fa3f6c8427d5b8336980fb702ebd7c48a79d24c1a0ff5a5110862e2740dbee2a8f7baef8433b098ab751190f6eb86 - languageName: node - linkType: hard - -"@changesets/assemble-release-plan@npm:^5.2.4": - version: 5.2.4 - resolution: "@changesets/assemble-release-plan@npm:5.2.4" - dependencies: - "@babel/runtime": "npm:^7.20.1" - "@changesets/errors": "npm:^0.1.4" - "@changesets/get-dependents-graph": "npm:^1.3.6" - "@changesets/types": "npm:^5.2.1" - "@manypkg/get-packages": "npm:^1.1.3" - semver: "npm:^7.5.3" - checksum: 10c0/603299bd6476b05d19c66a0f3236ea87a7cd1082b651ed95e5e68fb8b81120d089c523252eda09a4f0faf51755789f96ac5086b96198548c5e84fd5ca8644bbb - languageName: node - linkType: hard - -"@changesets/changelog-git@npm:^0.1.14": - version: 0.1.14 - resolution: "@changesets/changelog-git@npm:0.1.14" - dependencies: - "@changesets/types": "npm:^5.2.1" - checksum: 10c0/0d97b789fc68710e30265721ca1454c1038f701c756dac5a500035e6faea27b3755ffd2167f556684bf7bd4d3cebb5cfeefa5dcb322615503afad01b85d8dc31 - languageName: node - linkType: hard - -"@changesets/cli@npm:^2.26.2": - version: 2.26.2 - resolution: "@changesets/cli@npm:2.26.2" - dependencies: - "@babel/runtime": "npm:^7.20.1" - "@changesets/apply-release-plan": "npm:^6.1.4" - "@changesets/assemble-release-plan": "npm:^5.2.4" - "@changesets/changelog-git": "npm:^0.1.14" - "@changesets/config": "npm:^2.3.1" - "@changesets/errors": "npm:^0.1.4" - "@changesets/get-dependents-graph": "npm:^1.3.6" - "@changesets/get-release-plan": "npm:^3.0.17" - "@changesets/git": "npm:^2.0.0" - "@changesets/logger": "npm:^0.0.5" - "@changesets/pre": "npm:^1.0.14" - "@changesets/read": "npm:^0.5.9" - "@changesets/types": "npm:^5.2.1" - "@changesets/write": "npm:^0.2.3" - "@manypkg/get-packages": "npm:^1.1.3" - "@types/is-ci": "npm:^3.0.0" - "@types/semver": "npm:^7.5.0" - ansi-colors: "npm:^4.1.3" - chalk: "npm:^2.1.0" - enquirer: "npm:^2.3.0" - external-editor: "npm:^3.1.0" - fs-extra: "npm:^7.0.1" - human-id: "npm:^1.0.2" - is-ci: "npm:^3.0.1" - meow: "npm:^6.0.0" - outdent: "npm:^0.5.0" - p-limit: "npm:^2.2.0" - preferred-pm: "npm:^3.0.0" - resolve-from: "npm:^5.0.0" - semver: "npm:^7.5.3" - spawndamnit: "npm:^2.0.0" - term-size: "npm:^2.1.0" - tty-table: "npm:^4.1.5" - bin: - changeset: bin.js - checksum: 10c0/4f08d87b095ac98660158adc4b676ce0473d0b1126b2fb2568d984981a29434850e7af85627a2fe88386c2b5c16eb7bd44c65434a51d559bb856a3efe2f5fc90 - languageName: node - linkType: hard - -"@changesets/config@npm:^2.3.1": - version: 2.3.1 - resolution: "@changesets/config@npm:2.3.1" - dependencies: - "@changesets/errors": "npm:^0.1.4" - "@changesets/get-dependents-graph": "npm:^1.3.6" - "@changesets/logger": "npm:^0.0.5" - "@changesets/types": "npm:^5.2.1" - "@manypkg/get-packages": "npm:^1.1.3" - fs-extra: "npm:^7.0.1" - micromatch: "npm:^4.0.2" - checksum: 10c0/718944f63279222f41c81f544cce5628d689cb67e871297483d93a811625e66083400d3166e506cd24260e5b08275f054e4427ee05a2f2070895bcf27ab89ba2 - languageName: node - linkType: hard - -"@changesets/errors@npm:^0.1.4": - version: 0.1.4 - resolution: "@changesets/errors@npm:0.1.4" - dependencies: - extendable-error: "npm:^0.1.5" - checksum: 10c0/21bec4e599a6833e03e0037f1cb9605c36490615db0741bd6b81063e7f2d98f0e2bdf86109ff519934888581bc77ebf7b2a7554040b10f40b71f55b766048747 - languageName: node - linkType: hard - -"@changesets/get-dependents-graph@npm:^1.3.6": - version: 1.3.6 - resolution: "@changesets/get-dependents-graph@npm:1.3.6" - dependencies: - "@changesets/types": "npm:^5.2.1" - "@manypkg/get-packages": "npm:^1.1.3" - chalk: "npm:^2.1.0" - fs-extra: "npm:^7.0.1" - semver: "npm:^7.5.3" - checksum: 10c0/0ce46b7a99aa689740e58bb9692f574d25077c012f38eb67002bc7da83c3ceb77906f51de659d868d07a9abf84fa405cef31a5177af57434fab7b000b1ed0118 - languageName: node - linkType: hard - -"@changesets/get-release-plan@npm:^3.0.17": - version: 3.0.17 - resolution: "@changesets/get-release-plan@npm:3.0.17" - dependencies: - "@babel/runtime": "npm:^7.20.1" - "@changesets/assemble-release-plan": "npm:^5.2.4" - "@changesets/config": "npm:^2.3.1" - "@changesets/pre": "npm:^1.0.14" - "@changesets/read": "npm:^0.5.9" - "@changesets/types": "npm:^5.2.1" - "@manypkg/get-packages": "npm:^1.1.3" - checksum: 10c0/cbc9f804d30c9ec30ca3bd71eb2f3e811a12dc1399abc70fc33fd420a749f75b27eaf866893fd047326db02aba7e9e644537cdc202d2481bf4ee11663b39494d - languageName: node - linkType: hard - -"@changesets/get-version-range-type@npm:^0.3.2": - version: 0.3.2 - resolution: "@changesets/get-version-range-type@npm:0.3.2" - checksum: 10c0/a32c84cd6e5cdf746b9dde09aac9943141141af3be44c61433c45df0e57da348cd26c257b149f200caedb861a78349ac77130ea40e18a84f2ac68283045979e3 - languageName: node - linkType: hard - -"@changesets/git@npm:^2.0.0": - version: 2.0.0 - resolution: "@changesets/git@npm:2.0.0" - dependencies: - "@babel/runtime": "npm:^7.20.1" - "@changesets/errors": "npm:^0.1.4" - "@changesets/types": "npm:^5.2.1" - "@manypkg/get-packages": "npm:^1.1.3" - is-subdir: "npm:^1.1.1" - micromatch: "npm:^4.0.2" - spawndamnit: "npm:^2.0.0" - checksum: 10c0/0f5eb05a062feb8b5877cb90d2463f5cb816c0d39151f5f7be970a2118b2925dae3646ee0f9cffa86a819902b04d86f9150dbde9a071e9aff89fa17cc5628037 - languageName: node - linkType: hard - -"@changesets/logger@npm:^0.0.5": - version: 0.0.5 - resolution: "@changesets/logger@npm:0.0.5" - dependencies: - chalk: "npm:^2.1.0" - checksum: 10c0/a4659a86c97e4f0ba5844168d0c8a5fb3f8d8a6b81fcdc986919eef338ea8c847140b30649d860b35a2c06f6fe584c10cfb78e25153977485e9d18d2c6d4b06a - languageName: node - linkType: hard - -"@changesets/parse@npm:^0.3.16": - version: 0.3.16 - resolution: "@changesets/parse@npm:0.3.16" - dependencies: - "@changesets/types": "npm:^5.2.1" - js-yaml: "npm:^3.13.1" - checksum: 10c0/4fa076ef5ae856b54e62c57b2fae18482ab42a41cc70e059db1f6dade4e28ee796e5b9226af78e975bc9fb004748de5e09947da308fdd1d8bebc887c76f68054 - languageName: node - linkType: hard - -"@changesets/pre@npm:^1.0.14": - version: 1.0.14 - resolution: "@changesets/pre@npm:1.0.14" - dependencies: - "@babel/runtime": "npm:^7.20.1" - "@changesets/errors": "npm:^0.1.4" - "@changesets/types": "npm:^5.2.1" - "@manypkg/get-packages": "npm:^1.1.3" - fs-extra: "npm:^7.0.1" - checksum: 10c0/4030c4dc6ec93d97aecccc1c9526e0affc7b65ccac513777a3ead3414e3aa24c71b634be4c9ca71e56b56cb6bef4158b57cf8ce62c893f13837ac08ef199e024 - languageName: node - linkType: hard - -"@changesets/read@npm:^0.5.9": - version: 0.5.9 - resolution: "@changesets/read@npm:0.5.9" - dependencies: - "@babel/runtime": "npm:^7.20.1" - "@changesets/git": "npm:^2.0.0" - "@changesets/logger": "npm:^0.0.5" - "@changesets/parse": "npm:^0.3.16" - "@changesets/types": "npm:^5.2.1" - chalk: "npm:^2.1.0" - fs-extra: "npm:^7.0.1" - p-filter: "npm:^2.1.0" - checksum: 10c0/deb70f5e21ed5f6618fb79f16f19ccbbec38379613aa960f7c67133f73d3b8ef163b335d07b9d0658a46c9f615199322ab187d0693387791def2db75bf51ca2c - languageName: node - linkType: hard - -"@changesets/types@npm:^4.0.1": - version: 4.1.0 - resolution: "@changesets/types@npm:4.1.0" - checksum: 10c0/a372ad21f6a1e0d4ce6c19573c1ca269eef1ad53c26751ad9515a24f003e7c49dcd859dbb1fedb6badaf7be956c1559e8798304039e0ec0da2d9a68583f13464 - languageName: node - linkType: hard - -"@changesets/types@npm:^5.2.1": - version: 5.2.1 - resolution: "@changesets/types@npm:5.2.1" - checksum: 10c0/2500a5047e28daa4ffdef44ba4afb8f47a923b2466f976e3611a2afb29373152f64ca79c624a7b84d3b0c1d3e44d72f3a82871c21690b36e28073b8cd2825a28 - languageName: node - linkType: hard - -"@changesets/write@npm:^0.2.3": - version: 0.2.3 - resolution: "@changesets/write@npm:0.2.3" - dependencies: - "@babel/runtime": "npm:^7.20.1" - "@changesets/types": "npm:^5.2.1" - fs-extra: "npm:^7.0.1" - human-id: "npm:^1.0.2" - prettier: "npm:^2.7.1" - checksum: 10c0/24b7e0258421897a946275093b616529b12fe470aa785f088fb89c5844a5e41916abdbee0909b088e1e204e94725f2482c589ea80c14398e46b1723aee0bbbb4 - languageName: node - linkType: hard - "@csstools/css-parser-algorithms@npm:^2.6.1": version: 2.6.3 resolution: "@csstools/css-parser-algorithms@npm:2.6.3" @@ -3843,11 +3607,10 @@ __metadata: languageName: node linkType: hard -"@guardian/commercial@npm:23.6.0": - version: 23.6.0 - resolution: "@guardian/commercial@npm:23.6.0" +"@guardian/commercial@npm:23.7.0": + version: 23.7.0 + resolution: "@guardian/commercial@npm:23.7.0" dependencies: - "@changesets/cli": "npm:^2.26.2" "@guardian/prebid.js": "npm:8.52.0-8" "@octokit/core": "npm:^6.1.2" fastdom: "npm:^1.0.11" @@ -3863,7 +3626,7 @@ __metadata: "@guardian/libs": ^19.1.0 "@guardian/source": ^8.0.0 typescript: ~5.5.3 - checksum: 10c0/787aefe08049b037a02583e2c040a65c220662e83bd7e98d922a79f64847af50fb2dd77262bf382f6710d81e4ad0410a6c0cc3bcd33ad47bcff72f3eaad9409e + checksum: 10c0/0cdff54bd95d094329fe9210a44c6717b36fd8fe364f4ebbd1a8d48eea929d883895b837e6257befa413d3da8ddec85519746bbd2bbcbce33d58d33d17203884 languageName: node linkType: hard @@ -3936,7 +3699,7 @@ __metadata: "@emotion/react": "npm:11.11.1" "@emotion/styled": "npm:^10.0.27" "@guardian/ab-core": "npm:8.0.0" - "@guardian/commercial": "npm:23.6.0" + "@guardian/commercial": "npm:23.7.0" "@guardian/core-web-vitals": "npm:6.0.0" "@guardian/eslint-config-typescript": "npm:9.0.1" "@guardian/identity-auth": "npm:3.0.0" @@ -4607,32 +4370,6 @@ __metadata: languageName: node linkType: hard -"@manypkg/find-root@npm:^1.1.0": - version: 1.1.0 - resolution: "@manypkg/find-root@npm:1.1.0" - dependencies: - "@babel/runtime": "npm:^7.5.5" - "@types/node": "npm:^12.7.1" - find-up: "npm:^4.1.0" - fs-extra: "npm:^8.1.0" - checksum: 10c0/0ee907698e6c73d6f1821ff630f3fec6dcf38260817c8752fec8991ac38b95ba431ab11c2773ddf9beb33d0e057f1122b00e8ffc9b8411b3fd24151413626fa6 - languageName: node - linkType: hard - -"@manypkg/get-packages@npm:^1.1.3": - version: 1.1.3 - resolution: "@manypkg/get-packages@npm:1.1.3" - dependencies: - "@babel/runtime": "npm:^7.5.5" - "@changesets/types": "npm:^4.0.1" - "@manypkg/find-root": "npm:^1.1.0" - fs-extra: "npm:^8.1.0" - globby: "npm:^11.0.0" - read-yaml-file: "npm:^1.1.0" - checksum: 10c0/f05907d1174ae28861eaa06d0efdc144f773d9a4b8b65e1e7cdc01eb93361d335351b4a336e05c6aac02661be39e8809a3f7ad28bc67b6b338071434ab442130 - languageName: node - linkType: hard - "@mrmlnc/readdir-enhanced@npm:^2.2.1": version: 2.2.1 resolution: "@mrmlnc/readdir-enhanced@npm:2.2.1" @@ -5586,15 +5323,6 @@ __metadata: languageName: node linkType: hard -"@types/is-ci@npm:^3.0.0": - version: 3.0.2 - resolution: "@types/is-ci@npm:3.0.2" - dependencies: - ci-info: "npm:^3.1.0" - checksum: 10c0/6672d622ea93e40fce457c9f6ad8f028ce1110f66e29220e2e06b9757c2a7f26d9fe0175d353f2de3ca5853366117ab7876ace10d16839bfb44765cb0ed90b4c - languageName: node - linkType: hard - "@types/istanbul-lib-coverage@npm:*, @types/istanbul-lib-coverage@npm:^2.0.0, @types/istanbul-lib-coverage@npm:^2.0.1": version: 2.0.4 resolution: "@types/istanbul-lib-coverage@npm:2.0.4" @@ -5692,13 +5420,6 @@ __metadata: languageName: node linkType: hard -"@types/minimist@npm:^1.2.0": - version: 1.2.3 - resolution: "@types/minimist@npm:1.2.3" - checksum: 10c0/e57d18f3c49b286eb5e63f2f6ec77d9a71beace3d9ef21cc3ee5a8eb4161520918b7eb0dcf20046d05339b955208a972ef474cc568542cd64b7b6365b9ec6650 - languageName: node - linkType: hard - "@types/node-forge@npm:^1.3.0": version: 1.3.11 resolution: "@types/node-forge@npm:1.3.11" @@ -5715,20 +5436,6 @@ __metadata: languageName: node linkType: hard -"@types/node@npm:^12.7.1": - version: 12.20.55 - resolution: "@types/node@npm:12.20.55" - checksum: 10c0/3b190bb0410047d489c49bbaab592d2e6630de6a50f00ba3d7d513d59401d279972a8f5a598b5bb8ddc1702f8a2f4ec57a65d93852f9c329639738e7053637d1 - languageName: node - linkType: hard - -"@types/normalize-package-data@npm:^2.4.0": - version: 2.4.2 - resolution: "@types/normalize-package-data@npm:2.4.2" - checksum: 10c0/e38713ca1befc341701c078d592d1fddc1d13eec73b4d81fbab14638221733029f03cdf410b4486b23d48fd8d3809fa36611de98220e76f71517d42b582b3509 - languageName: node - linkType: hard - "@types/parse-json@npm:^4.0.0": version: 4.0.0 resolution: "@types/parse-json@npm:4.0.0" @@ -6550,13 +6257,6 @@ __metadata: languageName: node linkType: hard -"ansi-colors@npm:^4.1.1, ansi-colors@npm:^4.1.3": - version: 4.1.3 - resolution: "ansi-colors@npm:4.1.3" - checksum: 10c0/ec87a2f59902f74e61eada7f6e6fe20094a628dab765cfdbd03c3477599368768cffccdb5d3bb19a1b6c99126783a143b1fee31aab729b31ffe5836c7e5e28b9 - languageName: node - linkType: hard - "ansi-escapes@npm:^4.2.1": version: 4.3.2 resolution: "ansi-escapes@npm:4.3.2" @@ -6772,7 +6472,7 @@ __metadata: languageName: node linkType: hard -"array.prototype.flat@npm:^1.2.3, array.prototype.flat@npm:^1.3.2": +"array.prototype.flat@npm:^1.3.2": version: 1.3.2 resolution: "array.prototype.flat@npm:1.3.2" dependencies: @@ -6825,13 +6525,6 @@ __metadata: languageName: node linkType: hard -"arrify@npm:^1.0.1": - version: 1.0.1 - resolution: "arrify@npm:1.0.1" - checksum: 10c0/c35c8d1a81bcd5474c0c57fe3f4bad1a4d46a5fa353cedcff7a54da315df60db71829e69104b859dff96c5d68af46bd2be259fe5e50dc6aa9df3b36bea0383ab - languageName: node - linkType: hard - "arrify@npm:^2.0.1": version: 2.0.1 resolution: "arrify@npm:2.0.1" @@ -7218,15 +6911,6 @@ __metadata: languageName: node linkType: hard -"better-path-resolve@npm:1.0.0": - version: 1.0.0 - resolution: "better-path-resolve@npm:1.0.0" - dependencies: - is-windows: "npm:^1.0.0" - checksum: 10c0/7335130729d59a14b8e4753fea180ca84e287cccc20cb5f2438a95667abc5810327c414eee7b3c79ed1b5a348a40284ea872958f50caba69432c40405eb0acce - languageName: node - linkType: hard - "big.js@npm:^5.2.2": version: 5.2.2 resolution: "big.js@npm:5.2.2" @@ -7334,15 +7018,6 @@ __metadata: languageName: node linkType: hard -"breakword@npm:^1.0.5": - version: 1.0.6 - resolution: "breakword@npm:1.0.6" - dependencies: - wcwidth: "npm:^1.0.1" - checksum: 10c0/8bb2e329ee911de098a59d955cb25fad0a16d4f810e3c5ceacfe43ce67cda9117e7e9eafc827234f5429cc0dcaa4d9387e3529cbdcdeb66d1b9e521e28c49bc1 - languageName: node - linkType: hard - "browser-sync-client@npm:^3.0.2": version: 3.0.2 resolution: "browser-sync-client@npm:3.0.2" @@ -7588,18 +7263,7 @@ __metadata: languageName: node linkType: hard -"camelcase-keys@npm:^6.2.2": - version: 6.2.2 - resolution: "camelcase-keys@npm:6.2.2" - dependencies: - camelcase: "npm:^5.3.1" - map-obj: "npm:^4.0.0" - quick-lru: "npm:^4.0.1" - checksum: 10c0/bf1a28348c0f285c6c6f68fb98a9d088d3c0269fed0cdff3ea680d5a42df8a067b4de374e7a33e619eb9d5266a448fe66c2dd1f8e0c9209ebc348632882a3526 - languageName: node - linkType: hard - -"camelcase@npm:^5.0.0, camelcase@npm:^5.3.1": +"camelcase@npm:^5.3.1": version: 5.3.1 resolution: "camelcase@npm:5.3.1" checksum: 10c0/92ff9b443bfe8abb15f2b1513ca182d16126359ad4f955ebc83dc4ddcc4ef3fdd2c078bc223f2673dc223488e75c99b16cc4d056624374b799e6a1555cf61b23 @@ -7634,7 +7298,7 @@ __metadata: languageName: node linkType: hard -"chalk@npm:4.1.2, chalk@npm:^4.0.0, chalk@npm:^4.1.0, chalk@npm:^4.1.2": +"chalk@npm:4.1.2, chalk@npm:^4.0.0, chalk@npm:^4.1.0": version: 4.1.2 resolution: "chalk@npm:4.1.2" dependencies: @@ -7669,13 +7333,6 @@ __metadata: languageName: node linkType: hard -"chardet@npm:^0.7.0": - version: 0.7.0 - resolution: "chardet@npm:0.7.0" - checksum: 10c0/96e4731b9ec8050cbb56ab684e8c48d6c33f7826b755802d14e3ebfdc51c57afeece3ea39bc6b09acc359e4363525388b915e16640c1378053820f5e70d0f27d - languageName: node - linkType: hard - "chokidar@npm:>=3.0.0 <4.0.0, chokidar@npm:^3.6.0": version: 3.6.0 resolution: "chokidar@npm:3.6.0" @@ -7728,7 +7385,7 @@ __metadata: languageName: node linkType: hard -"ci-info@npm:^3.1.0, ci-info@npm:^3.2.0": +"ci-info@npm:^3.2.0": version: 3.9.0 resolution: "ci-info@npm:3.9.0" checksum: 10c0/6f0109e36e111684291d46123d491bc4e7b7a1934c3a20dea28cba89f1d4a03acd892f5f6a81ed3855c38647e285a150e3c9ba062e38943bef57fee6c1554c3a @@ -7800,17 +7457,6 @@ __metadata: languageName: node linkType: hard -"cliui@npm:^6.0.0": - version: 6.0.0 - resolution: "cliui@npm:6.0.0" - dependencies: - string-width: "npm:^4.2.0" - strip-ansi: "npm:^6.0.0" - wrap-ansi: "npm:^6.2.0" - checksum: 10c0/35229b1bb48647e882104cac374c9a18e34bbf0bace0e2cf03000326b6ca3050d6b59545d91e17bfe3705f4a0e2988787aa5cde6331bf5cbbf0164732cef6492 - languageName: node - linkType: hard - "cliui@npm:^8.0.1": version: 8.0.1 resolution: "cliui@npm:8.0.1" @@ -7833,13 +7479,6 @@ __metadata: languageName: node linkType: hard -"clone@npm:^1.0.2": - version: 1.0.4 - resolution: "clone@npm:1.0.4" - checksum: 10c0/2176952b3649293473999a95d7bebfc9dc96410f6cbd3d2595cf12fd401f63a4bf41a7adbfd3ab2ff09ed60cb9870c58c6acdd18b87767366fabfc163700f13b - languageName: node - linkType: hard - "co@npm:^4.6.0": version: 4.6.0 resolution: "co@npm:4.6.0" @@ -8255,17 +7894,6 @@ __metadata: languageName: node linkType: hard -"cross-spawn@npm:^5.1.0": - version: 5.1.0 - resolution: "cross-spawn@npm:5.1.0" - dependencies: - lru-cache: "npm:^4.0.1" - shebang-command: "npm:^1.2.0" - which: "npm:^1.2.9" - checksum: 10c0/1918621fddb9f8c61e02118b2dbf81f611ccd1544ceaca0d026525341832b8511ce2504c60f935dbc06b35e5ef156fe8c1e72708c27dd486f034e9c0e1e07201 - languageName: node - linkType: hard - "cross-spawn@npm:^6.0.0": version: 6.0.6 resolution: "cross-spawn@npm:6.0.6" @@ -8493,39 +8121,6 @@ __metadata: languageName: node linkType: hard -"csv-generate@npm:^3.4.3": - version: 3.4.3 - resolution: "csv-generate@npm:3.4.3" - checksum: 10c0/196afb16ec5e72f8a77a9742a9c5640868768e114ca5e0dcc22d4e6f9bfacb552432a2ca8658429b494d602d8fcc16f7efdad0ad45b7108fbd3f936074f43622 - languageName: node - linkType: hard - -"csv-parse@npm:^4.16.3": - version: 4.16.3 - resolution: "csv-parse@npm:4.16.3" - checksum: 10c0/40771fda105b10c3e44551fa4dbeab462315400deb572f2918c19d5848addd95ea3479aaaeaaf3bbd9235593a6d798dd90b9e6ba5c4ce570979bafc4bb1ba5f0 - languageName: node - linkType: hard - -"csv-stringify@npm:^5.6.5": - version: 5.6.5 - resolution: "csv-stringify@npm:5.6.5" - checksum: 10c0/125194dcf24a94e9c03eb53b3bc4b79cc6611747e73fe3c0e8a342a9f385caeb4e88c0827e89a4c508b45ea99bdc64a339b487f80048a50fabcbb3a7d87ea1a9 - languageName: node - linkType: hard - -"csv@npm:^5.5.3": - version: 5.5.3 - resolution: "csv@npm:5.5.3" - dependencies: - csv-generate: "npm:^3.4.3" - csv-parse: "npm:^4.16.3" - csv-stringify: "npm:^5.6.5" - stream-transform: "npm:^2.1.3" - checksum: 10c0/282720e1f9f1a332c0ff2c4d48d845eab2a60c23087c974eb6ffc4d907f40c053ae0f8458819d670ad2986ec25359e57dbccc0fa3370cd5d92e7d3143e345f95 - languageName: node - linkType: hard - "curl@cujojs/curl#0.8.9": version: 0.8.9 resolution: "curl@https://github.com/cujojs/curl.git#commit=261841045bc488c438d34347b588adfc1855faf1" @@ -8642,23 +8237,6 @@ __metadata: languageName: node linkType: hard -"decamelize-keys@npm:^1.1.0": - version: 1.1.1 - resolution: "decamelize-keys@npm:1.1.1" - dependencies: - decamelize: "npm:^1.1.0" - map-obj: "npm:^1.0.0" - checksum: 10c0/4ca385933127437658338c65fb9aead5f21b28d3dd3ccd7956eb29aab0953b5d3c047fbc207111672220c71ecf7a4d34f36c92851b7bbde6fca1a02c541bdd7d - languageName: node - linkType: hard - -"decamelize@npm:^1.1.0, decamelize@npm:^1.2.0": - version: 1.2.0 - resolution: "decamelize@npm:1.2.0" - checksum: 10c0/85c39fe8fbf0482d4a1e224ef0119db5c1897f8503bcef8b826adff7a1b11414972f6fef2d7dec2ee0b4be3863cf64ac1439137ae9e6af23a3d8dcbe26a5b4b2 - languageName: node - linkType: hard - "decimal.js@npm:^10.4.2": version: 10.4.3 resolution: "decimal.js@npm:10.4.3" @@ -8743,15 +8321,6 @@ __metadata: languageName: node linkType: hard -"defaults@npm:^1.0.3": - version: 1.0.4 - resolution: "defaults@npm:1.0.4" - dependencies: - clone: "npm:^1.0.2" - checksum: 10c0/9cfbe498f5c8ed733775db62dfd585780387d93c17477949e1670bfcfb9346e0281ce8c4bf9f4ac1fc0f9b851113bd6dc9e41182ea1644ccd97de639fa13c35a - languageName: node - linkType: hard - "define-data-property@npm:^1.0.1, define-data-property@npm:^1.1.4": version: 1.1.4 resolution: "define-data-property@npm:1.1.4" @@ -8816,13 +8385,6 @@ __metadata: languageName: node linkType: hard -"detect-indent@npm:^6.0.0": - version: 6.1.0 - resolution: "detect-indent@npm:6.1.0" - checksum: 10c0/dd83cdeda9af219cf77f5e9a0dc31d828c045337386cfb55ce04fad94ba872ee7957336834154f7647b89b899c3c7acc977c57a79b7c776b506240993f97acc7 - languageName: node - linkType: hard - "detect-newline@npm:^3.0.0": version: 3.1.0 resolution: "detect-newline@npm:3.1.0" @@ -9187,16 +8749,6 @@ __metadata: languageName: node linkType: hard -"enquirer@npm:^2.3.0": - version: 2.4.1 - resolution: "enquirer@npm:2.4.1" - dependencies: - ansi-colors: "npm:^4.1.1" - strip-ansi: "npm:^6.0.1" - checksum: 10c0/43850479d7a51d36a9c924b518dcdc6373b5a8ae3401097d336b7b7e258324749d0ad37a1fcaa5706f04799baa05585cd7af19ebdf7667673e7694435fcea918 - languageName: node - linkType: hard - "entities@npm:^2.0.0": version: 2.2.0 resolution: "entities@npm:2.2.0" @@ -9961,24 +9513,6 @@ __metadata: languageName: node linkType: hard -"extendable-error@npm:^0.1.5": - version: 0.1.7 - resolution: "extendable-error@npm:0.1.7" - checksum: 10c0/c46648b7682448428f81b157cbfe480170fd96359c55db477a839ddeaa34905a18cba0b989bafe5e83f93c2491a3fcc7cc536063ea326ba9d72e9c6e2fe736a7 - languageName: node - linkType: hard - -"external-editor@npm:^3.1.0": - version: 3.1.0 - resolution: "external-editor@npm:3.1.0" - dependencies: - chardet: "npm:^0.7.0" - iconv-lite: "npm:^0.4.24" - tmp: "npm:^0.0.33" - checksum: 10c0/c98f1ba3efdfa3c561db4447ff366a6adb5c1e2581462522c56a18bf90dfe4da382f9cd1feee3e330108c3595a854b218272539f311ba1b3298f841eb0fbf339 - languageName: node - linkType: hard - "extsprintf@npm:1.3.0": version: 1.3.0 resolution: "extsprintf@npm:1.3.0" @@ -10256,16 +9790,6 @@ __metadata: languageName: node linkType: hard -"find-yarn-workspace-root2@npm:1.2.16": - version: 1.2.16 - resolution: "find-yarn-workspace-root2@npm:1.2.16" - dependencies: - micromatch: "npm:^4.0.2" - pkg-dir: "npm:^4.2.0" - checksum: 10c0/d576067c7823de517d71831eafb5f6dc60554335c2d14445708f2698551b234f89c976a7f259d9355a44e417c49e7a93b369d0474579af02bbe2498f780c92d3 - languageName: node - linkType: hard - "flat-cache@npm:^3.0.4": version: 3.0.4 resolution: "flat-cache@npm:3.0.4" @@ -10383,28 +9907,6 @@ __metadata: languageName: node linkType: hard -"fs-extra@npm:^7.0.1": - version: 7.0.1 - resolution: "fs-extra@npm:7.0.1" - dependencies: - graceful-fs: "npm:^4.1.2" - jsonfile: "npm:^4.0.0" - universalify: "npm:^0.1.0" - checksum: 10c0/1943bb2150007e3739921b8d13d4109abdc3cc481e53b97b7ea7f77eda1c3c642e27ae49eac3af074e3496ea02fde30f411ef410c760c70a38b92e656e5da784 - languageName: node - linkType: hard - -"fs-extra@npm:^8.1.0": - version: 8.1.0 - resolution: "fs-extra@npm:8.1.0" - dependencies: - graceful-fs: "npm:^4.2.0" - jsonfile: "npm:^4.0.0" - universalify: "npm:^0.1.0" - checksum: 10c0/259f7b814d9e50d686899550c4f9ded85c46c643f7fe19be69504888e007fcbc08f306fae8ec495b8b998635e997c9e3e175ff2eeed230524ef1c1684cc96423 - languageName: node - linkType: hard - "fs-minipass@npm:^2.0.0": version: 2.1.0 resolution: "fs-minipass@npm:2.1.0" @@ -10507,7 +10009,7 @@ __metadata: languageName: node linkType: hard -"get-caller-file@npm:^2.0.1, get-caller-file@npm:^2.0.5": +"get-caller-file@npm:^2.0.5": version: 2.0.5 resolution: "get-caller-file@npm:2.0.5" checksum: 10c0/c6c7b60271931fa752aeb92f2b47e355eac1af3a2673f47c9589e8f8a41adc74d45551c1bc57b5e66a80609f10ffb72b6f575e4370d61cc3f7f3aaff01757cde @@ -10738,7 +10240,7 @@ __metadata: languageName: node linkType: hard -"globby@npm:^11.0.0, globby@npm:^11.0.1, globby@npm:^11.1.0": +"globby@npm:^11.0.1, globby@npm:^11.1.0": version: 11.1.0 resolution: "globby@npm:11.1.0" dependencies: @@ -10784,20 +10286,13 @@ __metadata: languageName: node linkType: hard -"graceful-fs@npm:^4.1.11, graceful-fs@npm:^4.1.2, graceful-fs@npm:^4.1.5, graceful-fs@npm:^4.1.6, graceful-fs@npm:^4.2.0, graceful-fs@npm:^4.2.4, graceful-fs@npm:^4.2.6, graceful-fs@npm:^4.2.9": +"graceful-fs@npm:^4.1.11, graceful-fs@npm:^4.1.2, graceful-fs@npm:^4.1.6, graceful-fs@npm:^4.2.4, graceful-fs@npm:^4.2.6, graceful-fs@npm:^4.2.9": version: 4.2.11 resolution: "graceful-fs@npm:4.2.11" checksum: 10c0/386d011a553e02bc594ac2ca0bd6d9e4c22d7fa8cfbfc448a6d148c59ea881b092db9dbe3547ae4b88e55f1b01f7c4a2ecc53b310c042793e63aa44cf6c257f2 languageName: node linkType: hard -"grapheme-splitter@npm:^1.0.4": - version: 1.0.4 - resolution: "grapheme-splitter@npm:1.0.4" - checksum: 10c0/108415fb07ac913f17040dc336607772fcea68c7f495ef91887edddb0b0f5ff7bc1d1ab181b125ecb2f0505669ef12c9a178a3bbd2dd8e042d8c5f1d7c90331a - languageName: node - linkType: hard - "graphemer@npm:^1.4.0": version: 1.4.0 resolution: "graphemer@npm:1.4.0" @@ -10875,13 +10370,6 @@ __metadata: languageName: node linkType: hard -"hard-rejection@npm:^2.1.0": - version: 2.1.0 - resolution: "hard-rejection@npm:2.1.0" - checksum: 10c0/febc3343a1ad575aedcc112580835b44a89a89e01f400b4eda6e8110869edfdab0b00cd1bd4c3bfec9475a57e79e0b355aecd5be46454b6a62b9a359af60e564 - languageName: node - linkType: hard - "has-bigints@npm:^1.0.1, has-bigints@npm:^1.0.2": version: 1.0.2 resolution: "has-bigints@npm:1.0.2" @@ -11026,13 +10514,6 @@ __metadata: languageName: node linkType: hard -"hosted-git-info@npm:^2.1.4": - version: 2.8.9 - resolution: "hosted-git-info@npm:2.8.9" - checksum: 10c0/317cbc6b1bbbe23c2a40ae23f3dafe9fa349ce42a89a36f930e3f9c0530c179a3882d2ef1e4141a4c3674d6faaea862138ec55b43ad6f75e387fda2483a13c70 - languageName: node - linkType: hard - "hpack.js@npm:^2.1.6": version: 2.1.6 resolution: "hpack.js@npm:2.1.6" @@ -11216,13 +10697,6 @@ __metadata: languageName: node linkType: hard -"human-id@npm:^1.0.2": - version: 1.0.2 - resolution: "human-id@npm:1.0.2" - checksum: 10c0/e4c3be49b3927ff8ac54ae4a95ed77ad94fd793b57be51aff39aa81931c6efe56303ce1ec76a70c74f85748644207c89ccfa63d828def1313eff7526a14c3b3b - languageName: node - linkType: hard - "human-signals@npm:^2.1.0": version: 2.1.0 resolution: "human-signals@npm:2.1.0" @@ -11237,7 +10711,7 @@ __metadata: languageName: node linkType: hard -"iconv-lite@npm:0.4.24, iconv-lite@npm:^0.4.24": +"iconv-lite@npm:0.4.24": version: 0.4.24 resolution: "iconv-lite@npm:0.4.24" dependencies: @@ -11504,17 +10978,6 @@ __metadata: languageName: node linkType: hard -"is-ci@npm:^3.0.1": - version: 3.0.1 - resolution: "is-ci@npm:3.0.1" - dependencies: - ci-info: "npm:^3.2.0" - bin: - is-ci: bin.js - checksum: 10c0/0e81caa62f4520d4088a5bef6d6337d773828a88610346c4b1119fb50c842587ed8bef1e5d9a656835a599e7209405b5761ddf2339668f2d0f4e889a92fe6051 - languageName: node - linkType: hard - "is-core-module@npm:^2.11.0, is-core-module@npm:^2.13.0, is-core-module@npm:^2.13.1, is-core-module@npm:^2.9.0": version: 2.13.1 resolution: "is-core-module@npm:2.13.1" @@ -11716,13 +11179,6 @@ __metadata: languageName: node linkType: hard -"is-plain-obj@npm:^1.1.0": - version: 1.1.0 - resolution: "is-plain-obj@npm:1.1.0" - checksum: 10c0/daaee1805add26f781b413fdf192fc91d52409583be30ace35c82607d440da63cc4cac0ac55136716688d6c0a2c6ef3edb2254fecbd1fe06056d6bd15975ee8c - languageName: node - linkType: hard - "is-plain-obj@npm:^3.0.0": version: 3.0.0 resolution: "is-plain-obj@npm:3.0.0" @@ -11811,15 +11267,6 @@ __metadata: languageName: node linkType: hard -"is-subdir@npm:^1.1.1": - version: 1.2.0 - resolution: "is-subdir@npm:1.2.0" - dependencies: - better-path-resolve: "npm:1.0.0" - checksum: 10c0/03a03ee2ee6578ce589b1cfaf00e65c86b20fd1b82c1660625557c535439a7477cda77e20c62cda6d4c99e7fd908b4619355ae2d989f4a524a35350a44353032 - languageName: node - linkType: hard - "is-symbol@npm:^1.0.2, is-symbol@npm:^1.0.3": version: 1.0.4 resolution: "is-symbol@npm:1.0.4" @@ -11887,13 +11334,6 @@ __metadata: languageName: node linkType: hard -"is-windows@npm:^1.0.0": - version: 1.0.2 - resolution: "is-windows@npm:1.0.2" - checksum: 10c0/b32f418ab3385604a66f1b7a3ce39d25e8881dee0bd30816dc8344ef6ff9df473a732bcc1ec4e84fe99b2f229ae474f7133e8e93f9241686cfcf7eebe53ba7a5 - languageName: node - linkType: hard - "is-wsl@npm:^1.1.0": version: 1.1.0 resolution: "is-wsl@npm:1.1.0" @@ -12551,7 +11991,7 @@ __metadata: languageName: node linkType: hard -"js-yaml@npm:^3.13.0, js-yaml@npm:^3.13.1, js-yaml@npm:^3.6.1": +"js-yaml@npm:^3.13.0, js-yaml@npm:^3.13.1": version: 3.14.1 resolution: "js-yaml@npm:3.14.1" dependencies: @@ -12735,18 +12175,6 @@ __metadata: languageName: node linkType: hard -"jsonfile@npm:^4.0.0": - version: 4.0.0 - resolution: "jsonfile@npm:4.0.0" - dependencies: - graceful-fs: "npm:^4.1.6" - dependenciesMeta: - graceful-fs: - optional: true - checksum: 10c0/7dc94b628d57a66b71fb1b79510d460d662eb975b5f876d723f81549c2e9cd316d58a2ddf742b2b93a4fa6b17b2accaf1a738a0e2ea114bdfb13a32e5377e480 - languageName: node - linkType: hard - "jsprim@npm:^1.2.2": version: 1.4.2 resolution: "jsprim@npm:1.4.2" @@ -12785,7 +12213,7 @@ __metadata: languageName: node linkType: hard -"kind-of@npm:^6.0.2, kind-of@npm:^6.0.3": +"kind-of@npm:^6.0.2": version: 6.0.3 resolution: "kind-of@npm:6.0.3" checksum: 10c0/61cdff9623dabf3568b6445e93e31376bee1cdb93f8ba7033d86022c2a9b1791a1d9510e026e6465ebd701a6dd2f7b0808483ad8838341ac52f003f512e0b4c4 @@ -12799,13 +12227,6 @@ __metadata: languageName: node linkType: hard -"kleur@npm:^4.1.5": - version: 4.1.5 - resolution: "kleur@npm:4.1.5" - checksum: 10c0/e9de6cb49657b6fa70ba2d1448fd3d691a5c4370d8f7bbf1c2f64c24d461270f2117e1b0afe8cb3114f13bbd8e51de158c2a224953960331904e636a5e4c0f2a - languageName: node - linkType: hard - "klona@npm:^2.0.6": version: 2.0.6 resolution: "klona@npm:2.0.6" @@ -12918,18 +12339,6 @@ __metadata: languageName: node linkType: hard -"load-yaml-file@npm:^0.2.0": - version: 0.2.0 - resolution: "load-yaml-file@npm:0.2.0" - dependencies: - graceful-fs: "npm:^4.1.5" - js-yaml: "npm:^3.13.0" - pify: "npm:^4.0.1" - strip-bom: "npm:^3.0.0" - checksum: 10c0/e00ed43048c0648dfef7639129b6d7e5c2272bc36d2a50dd983dd495f3341a02cd2c40765afa01345f798d0d894e5ba53212449933e72ddfa4d3f7a48f822d2f - languageName: node - linkType: hard - "loader-runner@npm:^4.2.0": version: 4.3.0 resolution: "loader-runner@npm:4.3.0" @@ -13018,13 +12427,6 @@ __metadata: languageName: node linkType: hard -"lodash.startcase@npm:^4.4.0": - version: 4.4.0 - resolution: "lodash.startcase@npm:4.4.0" - checksum: 10c0/bd82aa87a45de8080e1c5ee61128c7aee77bf7f1d86f4ff94f4a6d7438fc9e15e5f03374b947be577a93804c8ad6241f0251beaf1452bf716064eeb657b3a9f0 - languageName: node - linkType: hard - "lodash.truncate@npm:^4.4.2": version: 4.4.2 resolution: "lodash.truncate@npm:4.4.2" @@ -13086,16 +12488,6 @@ __metadata: languageName: node linkType: hard -"lru-cache@npm:^4.0.1": - version: 4.1.5 - resolution: "lru-cache@npm:4.1.5" - dependencies: - pseudomap: "npm:^1.0.2" - yallist: "npm:^2.1.2" - checksum: 10c0/1ca5306814e5add9ec63556d6fd9b24a4ecdeaef8e9cea52cbf30301e6b88c8d8ddc7cab45b59b56eb763e6c45af911585dc89925a074ab65e1502e3fe8103cf - languageName: node - linkType: hard - "lru-cache@npm:^5.1.1": version: 5.1.1 resolution: "lru-cache@npm:5.1.1" @@ -13175,13 +12567,6 @@ __metadata: languageName: node linkType: hard -"map-obj@npm:^4.0.0": - version: 4.3.0 - resolution: "map-obj@npm:4.3.0" - checksum: 10c0/1c19e1c88513c8abdab25c316367154c6a0a6a0f77e3e8c391bb7c0e093aefed293f539d026dc013d86219e5e4c25f23b0003ea588be2101ccd757bacc12d43b - languageName: node - linkType: hard - "mathml-tag-names@npm:^2.1.3": version: 2.1.3 resolution: "mathml-tag-names@npm:2.1.3" @@ -13246,25 +12631,6 @@ __metadata: languageName: node linkType: hard -"meow@npm:^6.0.0": - version: 6.1.1 - resolution: "meow@npm:6.1.1" - dependencies: - "@types/minimist": "npm:^1.2.0" - camelcase-keys: "npm:^6.2.2" - decamelize-keys: "npm:^1.1.0" - hard-rejection: "npm:^2.1.0" - minimist-options: "npm:^4.0.2" - normalize-package-data: "npm:^2.5.0" - read-pkg-up: "npm:^7.0.1" - redent: "npm:^3.0.0" - trim-newlines: "npm:^3.0.0" - type-fest: "npm:^0.13.1" - yargs-parser: "npm:^18.1.3" - checksum: 10c0/ceece1e5e09a53d7bf298ef137477e395a0dd30c8ed1a9980a52caad02eccffd6bce1a5cad4596cd694e7e924e949253f0cc1e7c22073c07ce7b06cfefbcf8be - languageName: node - linkType: hard - "merge-descriptors@npm:1.0.3": version: 1.0.3 resolution: "merge-descriptors@npm:1.0.3" @@ -13360,13 +12726,6 @@ __metadata: languageName: node linkType: hard -"min-indent@npm:^1.0.0": - version: 1.0.1 - resolution: "min-indent@npm:1.0.1" - checksum: 10c0/7e207bd5c20401b292de291f02913230cb1163abca162044f7db1d951fa245b174dc00869d40dd9a9f32a885ad6a5f3e767ee104cf278f399cb4e92d3f582d5c - languageName: node - linkType: hard - "mini-svg-data-uri@npm:1.4.4": version: 1.4.4 resolution: "mini-svg-data-uri@npm:1.4.4" @@ -13419,17 +12778,6 @@ __metadata: languageName: node linkType: hard -"minimist-options@npm:^4.0.2": - version: 4.1.0 - resolution: "minimist-options@npm:4.1.0" - dependencies: - arrify: "npm:^1.0.1" - is-plain-obj: "npm:^1.1.0" - kind-of: "npm:^6.0.3" - checksum: 10c0/7871f9cdd15d1e7374e5b013e2ceda3d327a06a8c7b38ae16d9ef941e07d985e952c589e57213f7aa90a8744c60aed9524c0d85e501f5478382d9181f2763f54 - languageName: node - linkType: hard - "minimist@npm:^1.2.0, minimist@npm:^1.2.6": version: 1.2.8 resolution: "minimist@npm:1.2.8" @@ -13544,13 +12892,6 @@ __metadata: languageName: node linkType: hard -"mixme@npm:^0.5.1": - version: 0.5.9 - resolution: "mixme@npm:0.5.9" - checksum: 10c0/7b30eb0120c1ec1cd01be496760cfad7ad0e408df674eaf87e716c3607a74f2a473c93f97eec71a01f878aaf924f351257d950521830de36e51263943c7420e4 - languageName: node - linkType: hard - "mkdirp@npm:^1.0.3, mkdirp@npm:^1.0.4": version: 1.0.4 resolution: "mkdirp@npm:1.0.4" @@ -13727,18 +13068,6 @@ __metadata: languageName: node linkType: hard -"normalize-package-data@npm:^2.5.0": - version: 2.5.0 - resolution: "normalize-package-data@npm:2.5.0" - dependencies: - hosted-git-info: "npm:^2.1.4" - resolve: "npm:^1.10.0" - semver: "npm:2 || 3 || 4 || 5" - validate-npm-package-license: "npm:^3.0.1" - checksum: 10c0/357cb1646deb42f8eb4c7d42c4edf0eec312f3628c2ef98501963cc4bbe7277021b2b1d977f982b2edce78f5a1014613ce9cf38085c3df2d76730481357ca504 - languageName: node - linkType: hard - "normalize-path@npm:^3.0.0, normalize-path@npm:~3.0.0": version: 3.0.0 resolution: "normalize-path@npm:3.0.0" @@ -14035,20 +13364,6 @@ __metadata: languageName: node linkType: hard -"os-tmpdir@npm:~1.0.2": - version: 1.0.2 - resolution: "os-tmpdir@npm:1.0.2" - checksum: 10c0/f438450224f8e2687605a8dd318f0db694b6293c5d835ae509a69e97c8de38b6994645337e5577f5001115470414638978cc49da1cdcc25106dad8738dc69990 - languageName: node - linkType: hard - -"outdent@npm:^0.5.0": - version: 0.5.0 - resolution: "outdent@npm:0.5.0" - checksum: 10c0/e216a4498889ba1babae06af84cdc4091f7cac86da49d22d0163b3be202a5f52efcd2bcd3dfca60a361eb3a27b4299f185c5655061b6b402552d7fcd1d040cff - languageName: node - linkType: hard - "p-all@npm:^2.1.0": version: 2.1.0 resolution: "p-all@npm:2.1.0" @@ -14555,18 +13870,6 @@ __metadata: languageName: node linkType: hard -"preferred-pm@npm:^3.0.0": - version: 3.1.2 - resolution: "preferred-pm@npm:3.1.2" - dependencies: - find-up: "npm:^5.0.0" - find-yarn-workspace-root2: "npm:1.2.16" - path-exists: "npm:^4.0.0" - which-pm: "npm:2.0.0" - checksum: 10c0/0c1a876461d41ddd8c5ecdcb4be2b8c93b408857c8b7ff7a14312920301b7458061d620b476da90e16b27a2d7d19688a51bdeddf200557ad1d925658f05796f8 - languageName: node - linkType: hard - "prelude-ls@npm:^1.2.1": version: 1.2.1 resolution: "prelude-ls@npm:1.2.1" @@ -14590,7 +13893,7 @@ __metadata: languageName: node linkType: hard -"prettier@npm:^2.2.1, prettier@npm:^2.7.1": +"prettier@npm:^2.2.1": version: 2.8.8 resolution: "prettier@npm:2.8.8" bin: @@ -14723,13 +14026,6 @@ __metadata: languageName: node linkType: hard -"pseudomap@npm:^1.0.2": - version: 1.0.2 - resolution: "pseudomap@npm:1.0.2" - checksum: 10c0/5a91ce114c64ed3a6a553aa7d2943868811377388bb31447f9d8028271bae9b05b340fe0b6961a64e45b9c72946aeb0a4ab635e8f7cb3715ffd0ff2beeb6a679 - languageName: node - linkType: hard - "psl@npm:^1.1.28, psl@npm:^1.1.33": version: 1.9.0 resolution: "psl@npm:1.9.0" @@ -14791,13 +14087,6 @@ __metadata: languageName: node linkType: hard -"quick-lru@npm:^4.0.1": - version: 4.0.1 - resolution: "quick-lru@npm:4.0.1" - checksum: 10c0/f9b1596fa7595a35c2f9d913ac312fede13d37dc8a747a51557ab36e11ce113bbe88ef4c0154968845559a7709cb6a7e7cbe75f7972182451cd45e7f057a334d - languageName: node - linkType: hard - "qwery@npm:3.4.2": version: 3.4.2 resolution: "qwery@npm:3.4.2" @@ -14889,41 +14178,6 @@ __metadata: languageName: node linkType: hard -"read-pkg-up@npm:^7.0.1": - version: 7.0.1 - resolution: "read-pkg-up@npm:7.0.1" - dependencies: - find-up: "npm:^4.1.0" - read-pkg: "npm:^5.2.0" - type-fest: "npm:^0.8.1" - checksum: 10c0/82b3ac9fd7c6ca1bdc1d7253eb1091a98ff3d195ee0a45386582ce3e69f90266163c34121e6a0a02f1630073a6c0585f7880b3865efcae9c452fa667f02ca385 - languageName: node - linkType: hard - -"read-pkg@npm:^5.2.0": - version: 5.2.0 - resolution: "read-pkg@npm:5.2.0" - dependencies: - "@types/normalize-package-data": "npm:^2.4.0" - normalize-package-data: "npm:^2.5.0" - parse-json: "npm:^5.0.0" - type-fest: "npm:^0.6.0" - checksum: 10c0/b51a17d4b51418e777029e3a7694c9bd6c578a5ab99db544764a0b0f2c7c0f58f8a6bc101f86a6fceb8ba6d237d67c89acf6170f6b98695d0420ddc86cf109fb - languageName: node - linkType: hard - -"read-yaml-file@npm:^1.1.0": - version: 1.1.0 - resolution: "read-yaml-file@npm:1.1.0" - dependencies: - graceful-fs: "npm:^4.1.5" - js-yaml: "npm:^3.6.1" - pify: "npm:^4.0.1" - strip-bom: "npm:^3.0.0" - checksum: 10c0/85a9ba08bb93f3c91089bab4f1603995ec7156ee595f8ce40ae9f49d841cbb586511508bd47b7cf78c97f678c679b2c6e2c0092e63f124214af41b6f8a25ca31 - languageName: node - linkType: hard - "readable-stream@npm:2 || 3, readable-stream@npm:^3.0.6": version: 3.6.2 resolution: "readable-stream@npm:3.6.2" @@ -14980,16 +14234,6 @@ __metadata: languageName: node linkType: hard -"redent@npm:^3.0.0": - version: 3.0.0 - resolution: "redent@npm:3.0.0" - dependencies: - indent-string: "npm:^4.0.0" - strip-indent: "npm:^3.0.0" - checksum: 10c0/d64a6b5c0b50eb3ddce3ab770f866658a2b9998c678f797919ceb1b586bab9259b311407280bd80b804e2a7c7539b19238ae6a2a20c843f1a7fcff21d48c2eae - languageName: node - linkType: hard - "regenerate-unicode-properties@npm:^10.1.0": version: 10.1.1 resolution: "regenerate-unicode-properties@npm:10.1.1" @@ -15149,13 +14393,6 @@ __metadata: languageName: node linkType: hard -"require-main-filename@npm:^2.0.0": - version: 2.0.0 - resolution: "require-main-filename@npm:2.0.0" - checksum: 10c0/db91467d9ead311b4111cbd73a4e67fa7820daed2989a32f7023785a2659008c6d119752d9c4ac011ae07e537eb86523adff99804c5fdb39cd3a017f9b401bb6 - languageName: node - linkType: hard - "requireindex@npm:^1.1.0": version: 1.2.0 resolution: "requireindex@npm:1.2.0" @@ -15207,7 +14444,7 @@ __metadata: languageName: node linkType: hard -"resolve@npm:^1.10.0, resolve@npm:^1.12.0, resolve@npm:^1.14.2, resolve@npm:^1.19.0, resolve@npm:^1.20.0, resolve@npm:^1.22.4": +"resolve@npm:^1.12.0, resolve@npm:^1.14.2, resolve@npm:^1.19.0, resolve@npm:^1.20.0, resolve@npm:^1.22.4": version: 1.22.8 resolution: "resolve@npm:1.22.8" dependencies: @@ -15246,7 +14483,7 @@ __metadata: languageName: node linkType: hard -"resolve@patch:resolve@npm%3A^1.10.0#optional!builtin, resolve@patch:resolve@npm%3A^1.12.0#optional!builtin, resolve@patch:resolve@npm%3A^1.14.2#optional!builtin, resolve@patch:resolve@npm%3A^1.19.0#optional!builtin, resolve@patch:resolve@npm%3A^1.20.0#optional!builtin, resolve@patch:resolve@npm%3A^1.22.4#optional!builtin": +"resolve@patch:resolve@npm%3A^1.12.0#optional!builtin, resolve@patch:resolve@npm%3A^1.14.2#optional!builtin, resolve@patch:resolve@npm%3A^1.19.0#optional!builtin, resolve@patch:resolve@npm%3A^1.20.0#optional!builtin, resolve@patch:resolve@npm%3A^1.22.4#optional!builtin": version: 1.22.8 resolution: "resolve@patch:resolve@npm%3A1.22.8#optional!builtin::version=1.22.8&hash=c3c19d" dependencies: @@ -15635,7 +14872,7 @@ __metadata: languageName: node linkType: hard -"semver@npm:2 || 3 || 4 || 5, semver@npm:^5.4.1, semver@npm:^5.5.0, semver@npm:^5.6.0, semver@npm:^5.7.2": +"semver@npm:^5.4.1, semver@npm:^5.5.0, semver@npm:^5.6.0, semver@npm:^5.7.2": version: 5.7.2 resolution: "semver@npm:5.7.2" bin: @@ -15779,13 +15016,6 @@ __metadata: languageName: node linkType: hard -"set-blocking@npm:^2.0.0": - version: 2.0.0 - resolution: "set-blocking@npm:2.0.0" - checksum: 10c0/9f8c1b2d800800d0b589de1477c753492de5c1548d4ade52f57f1d1f5e04af5481554d75ce5e5c43d4004b80a3eb714398d6907027dc0534177b7539119f4454 - languageName: node - linkType: hard - "set-function-length@npm:^1.2.1": version: 1.2.2 resolution: "set-function-length@npm:1.2.2" @@ -15981,22 +15211,6 @@ __metadata: languageName: node linkType: hard -"smartwrap@npm:^2.0.2": - version: 2.0.2 - resolution: "smartwrap@npm:2.0.2" - dependencies: - array.prototype.flat: "npm:^1.2.3" - breakword: "npm:^1.0.5" - grapheme-splitter: "npm:^1.0.4" - strip-ansi: "npm:^6.0.0" - wcwidth: "npm:^1.0.1" - yargs: "npm:^15.1.0" - bin: - smartwrap: src/terminal-adapter.js - checksum: 10c0/ea104632a832967a04cb739253dbd7d2e194c62bae1c3366d03bb5827870b83842a3e25a7f80287a4b04484ea4f64b51a0657389fc6a6fe701db3b25319ed56f - languageName: node - linkType: hard - "socket.io-adapter@npm:~2.5.2": version: 2.5.5 resolution: "socket.io-adapter@npm:2.5.5" @@ -16131,50 +15345,6 @@ __metadata: languageName: node linkType: hard -"spawndamnit@npm:^2.0.0": - version: 2.0.0 - resolution: "spawndamnit@npm:2.0.0" - dependencies: - cross-spawn: "npm:^5.1.0" - signal-exit: "npm:^3.0.2" - checksum: 10c0/3d3aa1b750130a78cad591828c203e706cb132fbd7dccab8ae5354984117cd1464c7f9ef6c4756e6590fec16bab77fe2c85d1eb8e59006d303836007922d359c - languageName: node - linkType: hard - -"spdx-correct@npm:^3.0.0": - version: 3.2.0 - resolution: "spdx-correct@npm:3.2.0" - dependencies: - spdx-expression-parse: "npm:^3.0.0" - spdx-license-ids: "npm:^3.0.0" - checksum: 10c0/49208f008618b9119208b0dadc9208a3a55053f4fd6a0ae8116861bd22696fc50f4142a35ebfdb389e05ccf2de8ad142573fefc9e26f670522d899f7b2fe7386 - languageName: node - linkType: hard - -"spdx-exceptions@npm:^2.1.0": - version: 2.3.0 - resolution: "spdx-exceptions@npm:2.3.0" - checksum: 10c0/83089e77d2a91cb6805a5c910a2bedb9e50799da091f532c2ba4150efdef6e53f121523d3e2dc2573a340dc0189e648b03157097f65465b3a0c06da1f18d7e8a - languageName: node - linkType: hard - -"spdx-expression-parse@npm:^3.0.0": - version: 3.0.1 - resolution: "spdx-expression-parse@npm:3.0.1" - dependencies: - spdx-exceptions: "npm:^2.1.0" - spdx-license-ids: "npm:^3.0.0" - checksum: 10c0/6f8a41c87759fa184a58713b86c6a8b028250f158159f1d03ed9d1b6ee4d9eefdc74181c8ddc581a341aa971c3e7b79e30b59c23b05d2436d5de1c30bdef7171 - languageName: node - linkType: hard - -"spdx-license-ids@npm:^3.0.0": - version: 3.0.16 - resolution: "spdx-license-ids@npm:3.0.16" - checksum: 10c0/7d88b8f01308948bb3ea69c066448f2776cf3d35a410d19afb836743086ced1566f6824ee8e6d67f8f25aa81fa86d8076a666c60ac4528caecd55e93edb5114e - languageName: node - linkType: hard - "spdy-transport@npm:^3.0.0": version: 3.0.0 resolution: "spdy-transport@npm:3.0.0" @@ -16347,15 +15517,6 @@ __metadata: languageName: node linkType: hard -"stream-transform@npm:^2.1.3": - version: 2.1.3 - resolution: "stream-transform@npm:2.1.3" - dependencies: - mixme: "npm:^0.5.1" - checksum: 10c0/8a4b40e1ee952869358c12bbb3da3aa9ca30c8964f8f8eef2058a3b6b2202d7a856657ef458a5f2402a464310d177f92d2e4a119667854fce4b17c05e3c180bd - languageName: node - linkType: hard - "strictdom@npm:^1.0.1": version: 1.0.1 resolution: "strictdom@npm:1.0.1" @@ -16527,15 +15688,6 @@ __metadata: languageName: node linkType: hard -"strip-indent@npm:^3.0.0": - version: 3.0.0 - resolution: "strip-indent@npm:3.0.0" - dependencies: - min-indent: "npm:^1.0.0" - checksum: 10c0/ae0deaf41c8d1001c5d4fbe16cb553865c1863da4fae036683b474fa926af9fc121e155cb3fc57a68262b2ae7d5b8420aa752c97a6428c315d00efe2a3875679 - languageName: node - linkType: hard - "strip-json-comments@npm:^3.1.1": version: 3.1.1 resolution: "strip-json-comments@npm:3.1.1" @@ -16804,13 +15956,6 @@ __metadata: languageName: node linkType: hard -"term-size@npm:^2.1.0": - version: 2.2.1 - resolution: "term-size@npm:2.2.1" - checksum: 10c0/89f6bba1d05d425156c0910982f9344d9e4aebf12d64bfa1f460d93c24baa7bc4c4a21d355fbd7153c316433df0538f64d0ae6e336cc4a69fdda4f85d62bc79d - languageName: node - linkType: hard - "terser-webpack-plugin@npm:^5.3.7": version: 5.3.7 resolution: "terser-webpack-plugin@npm:5.3.7" @@ -16905,15 +16050,6 @@ __metadata: languageName: node linkType: hard -"tmp@npm:^0.0.33": - version: 0.0.33 - resolution: "tmp@npm:0.0.33" - dependencies: - os-tmpdir: "npm:~1.0.2" - checksum: 10c0/69863947b8c29cabad43fe0ce65cec5bb4b481d15d4b4b21e036b060b3edbf3bc7a5541de1bacb437bb3f7c4538f669752627fdf9b4aaf034cebd172ba373408 - languageName: node - linkType: hard - "tmpl@npm:1.0.5": version: 1.0.5 resolution: "tmpl@npm:1.0.5" @@ -16991,13 +16127,6 @@ __metadata: languageName: node linkType: hard -"trim-newlines@npm:^3.0.0": - version: 3.0.1 - resolution: "trim-newlines@npm:3.0.1" - checksum: 10c0/03cfefde6c59ff57138412b8c6be922ecc5aec30694d784f2a65ef8dcbd47faef580b7de0c949345abdc56ec4b4abf64dd1e5aea619b200316e471a3dd5bf1f6 - languageName: node - linkType: hard - "tryit@npm:^1.0.1": version: 1.0.3 resolution: "tryit@npm:1.0.3" @@ -17107,23 +16236,6 @@ __metadata: languageName: node linkType: hard -"tty-table@npm:^4.1.5": - version: 4.2.2 - resolution: "tty-table@npm:4.2.2" - dependencies: - chalk: "npm:^4.1.2" - csv: "npm:^5.5.3" - kleur: "npm:^4.1.5" - smartwrap: "npm:^2.0.2" - strip-ansi: "npm:^6.0.1" - wcwidth: "npm:^1.0.1" - yargs: "npm:^17.7.1" - bin: - tty-table: adapters/terminal-adapter.js - checksum: 10c0/75a83d9da09322b30527c726b84db3146246a43e4d0ef6c66097bf2031e5ee40362634417cd67939960a438a25f42b1ad1720e28c9a7e7fa6ddd1fbbaa188310 - languageName: node - linkType: hard - "tunnel-agent@npm:^0.6.0": version: 0.6.0 resolution: "tunnel-agent@npm:0.6.0" @@ -17165,13 +16277,6 @@ __metadata: languageName: node linkType: hard -"type-fest@npm:^0.13.1": - version: 0.13.1 - resolution: "type-fest@npm:0.13.1" - checksum: 10c0/0c0fa07ae53d4e776cf4dac30d25ad799443e9eef9226f9fddbb69242db86b08584084a99885cfa5a9dfe4c063ebdc9aa7b69da348e735baede8d43f1aeae93b - languageName: node - linkType: hard - "type-fest@npm:^0.20.2": version: 0.20.2 resolution: "type-fest@npm:0.20.2" @@ -17186,20 +16291,6 @@ __metadata: languageName: node linkType: hard -"type-fest@npm:^0.6.0": - version: 0.6.0 - resolution: "type-fest@npm:0.6.0" - checksum: 10c0/0c585c26416fce9ecb5691873a1301b5aff54673c7999b6f925691ed01f5b9232db408cdbb0bd003d19f5ae284322523f44092d1f81ca0a48f11f7cf0be8cd38 - languageName: node - linkType: hard - -"type-fest@npm:^0.8.1": - version: 0.8.1 - resolution: "type-fest@npm:0.8.1" - checksum: 10c0/dffbb99329da2aa840f506d376c863bd55f5636f4741ad6e65e82f5ce47e6914108f44f340a0b74009b0cb5d09d6752ae83203e53e98b1192cf80ecee5651636 - languageName: node - linkType: hard - "type-is@npm:~1.6.18": version: 1.6.18 resolution: "type-is@npm:1.6.18" @@ -17529,16 +16620,6 @@ __metadata: languageName: node linkType: hard -"validate-npm-package-license@npm:^3.0.1": - version: 3.0.4 - resolution: "validate-npm-package-license@npm:3.0.4" - dependencies: - spdx-correct: "npm:^3.0.0" - spdx-expression-parse: "npm:^3.0.0" - checksum: 10c0/7b91e455a8de9a0beaa9fe961e536b677da7f48c9a493edf4d4d4a87fd80a7a10267d438723364e432c2fcd00b5650b5378275cded362383ef570276e6312f4f - languageName: node - linkType: hard - "vary@npm:^1, vary@npm:~1.1.2": version: 1.1.2 resolution: "vary@npm:1.1.2" @@ -17698,15 +16779,6 @@ __metadata: languageName: node linkType: hard -"wcwidth@npm:^1.0.1": - version: 1.0.1 - resolution: "wcwidth@npm:1.0.1" - dependencies: - defaults: "npm:^1.0.3" - checksum: 10c0/5b61ca583a95e2dd85d7078400190efd452e05751a64accb8c06ce4db65d7e0b0cde9917d705e826a2e05cc2548f61efde115ffa374c3e436d04be45c889e5b4 - languageName: node - linkType: hard - "web-vitals@npm:3.5.1": version: 3.5.1 resolution: "web-vitals@npm:3.5.1" @@ -17990,23 +17062,6 @@ __metadata: languageName: node linkType: hard -"which-module@npm:^2.0.0": - version: 2.0.1 - resolution: "which-module@npm:2.0.1" - checksum: 10c0/087038e7992649eaffa6c7a4f3158d5b53b14cf5b6c1f0e043dccfacb1ba179d12f17545d5b85ebd94a42ce280a6fe65d0cbcab70f4fc6daad1dfae85e0e6a3e - languageName: node - linkType: hard - -"which-pm@npm:2.0.0": - version: 2.0.0 - resolution: "which-pm@npm:2.0.0" - dependencies: - load-yaml-file: "npm:^0.2.0" - path-exists: "npm:^4.0.0" - checksum: 10c0/499fdf18fb259ea7dd58aab0df5f44240685364746596d0d08d9d68ac3a7205bde710ec1023dbc9148b901e755decb1891aa6790ceffdb81c603b6123ec7b5e4 - languageName: node - linkType: hard - "which-typed-array@npm:^1.1.14, which-typed-array@npm:^1.1.15, which-typed-array@npm:^1.1.9": version: 1.1.15 resolution: "which-typed-array@npm:1.1.15" @@ -18085,17 +17140,6 @@ __metadata: languageName: node linkType: hard -"wrap-ansi@npm:^6.2.0": - version: 6.2.0 - resolution: "wrap-ansi@npm:6.2.0" - dependencies: - ansi-styles: "npm:^4.0.0" - string-width: "npm:^4.1.0" - strip-ansi: "npm:^6.0.0" - checksum: 10c0/baad244e6e33335ea24e86e51868fe6823626e3a3c88d9a6674642afff1d34d9a154c917e74af8d845fd25d170c4ea9cf69a47133c3f3656e1252b3d462d9f6c - languageName: node - linkType: hard - "wrap-ansi@npm:^8.1.0": version: 8.1.0 resolution: "wrap-ansi@npm:8.1.0" @@ -18230,13 +17274,6 @@ __metadata: languageName: node linkType: hard -"y18n@npm:^4.0.0": - version: 4.0.3 - resolution: "y18n@npm:4.0.3" - checksum: 10c0/308a2efd7cc296ab2c0f3b9284fd4827be01cfeb647b3ba18230e3a416eb1bc887ac050de9f8c4fd9e7856b2e8246e05d190b53c96c5ad8d8cb56dffb6f81024 - languageName: node - linkType: hard - "y18n@npm:^5.0.5": version: 5.0.8 resolution: "y18n@npm:5.0.8" @@ -18244,13 +17281,6 @@ __metadata: languageName: node linkType: hard -"yallist@npm:^2.1.2": - version: 2.1.2 - resolution: "yallist@npm:2.1.2" - checksum: 10c0/0b9e25aa00adf19e01d2bcd4b208aee2b0db643d9927131797b7af5ff69480fc80f1c3db738cbf3946f0bddf39d8f2d0a5709c644fd42d4aa3a4e6e786c087b5 - languageName: node - linkType: hard - "yallist@npm:^3.0.2": version: 3.1.1 resolution: "yallist@npm:3.1.1" @@ -18272,16 +17302,6 @@ __metadata: languageName: node linkType: hard -"yargs-parser@npm:^18.1.2, yargs-parser@npm:^18.1.3": - version: 18.1.3 - resolution: "yargs-parser@npm:18.1.3" - dependencies: - camelcase: "npm:^5.0.0" - decamelize: "npm:^1.2.0" - checksum: 10c0/25df918833592a83f52e7e4f91ba7d7bfaa2b891ebf7fe901923c2ee797534f23a176913ff6ff7ebbc1cc1725a044cc6a6539fed8bfd4e13b5b16376875f9499 - languageName: node - linkType: hard - "yargs-parser@npm:^21.0.1, yargs-parser@npm:^21.1.1": version: 21.1.1 resolution: "yargs-parser@npm:21.1.1" @@ -18289,25 +17309,6 @@ __metadata: languageName: node linkType: hard -"yargs@npm:^15.1.0": - version: 15.4.1 - resolution: "yargs@npm:15.4.1" - dependencies: - cliui: "npm:^6.0.0" - decamelize: "npm:^1.2.0" - find-up: "npm:^4.1.0" - get-caller-file: "npm:^2.0.1" - require-directory: "npm:^2.1.1" - require-main-filename: "npm:^2.0.0" - set-blocking: "npm:^2.0.0" - string-width: "npm:^4.2.0" - which-module: "npm:^2.0.0" - y18n: "npm:^4.0.0" - yargs-parser: "npm:^18.1.2" - checksum: 10c0/f1ca680c974333a5822732825cca7e95306c5a1e7750eb7b973ce6dc4f97a6b0a8837203c8b194f461969bfe1fb1176d1d423036635285f6010b392fa498ab2d - languageName: node - linkType: hard - "yargs@npm:^17.2.1, yargs@npm:^17.3.1, yargs@npm:^17.7.1": version: 17.7.1 resolution: "yargs@npm:17.7.1" From c7b403b8e08ef83e69698cda72131d7407e360cc Mon Sep 17 00:00:00 2001 From: Georges Lebreton <102960844+Georges-GNM@users.noreply.github.com> Date: Wed, 20 Nov 2024 11:00:01 +0000 Subject: [PATCH 08/12] Adjust collection level logic to default to Primary for beta collections (#27607) Co-authored-by: Charlotte Emms <43961396+cemms1@users.noreply.github.com> --- common/app/model/CollectionConfig.scala | 28 ++++++++++++++++++------- project/Dependencies.scala | 2 +- 2 files changed, 22 insertions(+), 8 deletions(-) diff --git a/common/app/model/CollectionConfig.scala b/common/app/model/CollectionConfig.scala index b8ad3f55d6a..d12150f9a9b 100644 --- a/common/app/model/CollectionConfig.scala +++ b/common/app/model/CollectionConfig.scala @@ -1,7 +1,7 @@ package model.pressed import com.gu.facia.api.{models => fapi} -import com.gu.facia.client.models.{Backfill, CollectionConfigJson, Metadata, CollectionPlatform, Primary, Secondary} +import com.gu.facia.client.models.{Backfill, CollectionConfigJson, Metadata, CollectionPlatform, Secondary} final case class CollectionConfig( displayName: Option[String], @@ -29,14 +29,28 @@ object CollectionConfig { def make(config: fapi.CollectionConfig): CollectionConfig = { - /** Extract `primary` or `secondary` collection level tag from metadata if present. Collection level is a concept - * that allows the platforms to style containers differently based on their "level" + val betaCollections = List( + "flexible/special", + "flexible/general", + "scrollable/highlights", + "scrollable/small", + "scrollable/medium", + "scrollable/feature", + "static/medium/4", + "static/feature/2", + ) + + /** Collection level is a concept that allows the platforms to style containers differently based on their "level". + * Beta collections are "Secondary" if tagged as such or "Primary" otherwise. Legacy containers have no container + * level set. */ - val collectionLevel: Option[String] = config.metadata.flatMap { metadataList => - metadataList.collectFirst { - case Primary => "Primary" - case Secondary => "Secondary" + val collectionLevel: Option[String] = if (betaCollections.contains(config.collectionType)) { + config.metadata.getOrElse(List.empty).find(_ == Secondary) match { + case Some(_) => Some("Secondary") + case None => Some("Primary") } + } else { + None } CollectionConfig( diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 29751049d28..8974c0df116 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -7,7 +7,7 @@ object Dependencies { val awsVersion = "1.12.758" val awsSdk2Version = "2.26.27" val capiVersion = "32.0.0" - val faciaVersion = "12.1.0" + val faciaVersion = "13.0.0" val dispatchVersion = "0.13.1" val romeVersion = "1.0" val jerseyVersion = "1.19.4" From f6b8b9a1b76b56cd2446013377dd00ca3d162258 Mon Sep 17 00:00:00 2001 From: DanielCliftonGuardian <110032454+DanielCliftonGuardian@users.noreply.github.com> Date: Wed, 20 Nov 2024 12:35:28 +0000 Subject: [PATCH 09/12] Update CrosswordsController.scala --- .../app/controllers/CrosswordsController.scala | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/applications/app/controllers/CrosswordsController.scala b/applications/app/controllers/CrosswordsController.scala index 3b52eadc9e5..48c16256bec 100644 --- a/applications/app/controllers/CrosswordsController.scala +++ b/applications/app/controllers/CrosswordsController.scala @@ -1,12 +1,10 @@ package controllers -import com.gu.contentapi.client.model.v1.Content.unsafeEmpty.crossword import com.gu.contentapi.client.model.v1.CrosswordType.{Cryptic, Quick} import com.gu.contentapi.client.model.v1.{Crossword, ItemResponse, Content => ApiContent, Section => ApiSection} import common.{Edition, GuLogging, ImplicitControllerExecutionContext} import conf.Static import contentapi.ContentApiClient -import pages.{CrosswordHtmlPage, IndexHtmlPage, PrintableCrosswordHtmlPage} import crosswords.{ AccessibleCrosswordPage, AccessibleCrosswordRows, @@ -16,20 +14,20 @@ import crosswords.{ CrosswordSearchPageWithResults, CrosswordSvg, } +import html.HtmlPageHelpers.ContentCSSFile import model.Cached.{RevalidatableResult, WithoutRevalidationResult} import model._ +import model.dotcomrendering.pageElements.EditionsCrosswordRenderingDataModel +import model.dotcomrendering.{DotcomRenderingDataModel, PageType} import org.joda.time.{DateTime, LocalDate} +import pages.{CrosswordHtmlPage, IndexHtmlPage, PrintableCrosswordHtmlPage} import play.api.data.Forms._ import play.api.data._ -import play.api.mvc.{Action, RequestHeader, Result, _} -import services.{IndexPage, IndexPageItem} -import html.HtmlPageHelpers.ContentCSSFile -import model.dotcomrendering.pageElements.EditionsCrosswordRenderingDataModel -import model.dotcomrendering.pageElements.EditionsCrosswordRenderingDataModel.toJson -import model.dotcomrendering.{DotcomRenderingDataModel, PageType} import play.api.libs.ws.WSClient +import play.api.mvc._ import renderers.DotcomRenderingService import services.dotcomrendering.{CrosswordsPicker, RemoteRender} +import services.{IndexPage, IndexPageItem} import scala.concurrent.Future import scala.concurrent.duration._ From 5349994491d24fa704a7deaba0bcdca87a9dcfc4 Mon Sep 17 00:00:00 2001 From: Jake Date: Wed, 20 Nov 2024 13:23:06 +0000 Subject: [PATCH 10/12] bump (#27627) --- package.json | 2 +- yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index baf711b3f15..db796d56dee 100644 --- a/package.json +++ b/package.json @@ -28,7 +28,7 @@ "@emotion/react": "11.11.1", "@emotion/styled": "^10.0.27", "@guardian/ab-core": "8.0.0", - "@guardian/commercial": "23.7.0", + "@guardian/commercial": "23.7.1", "@guardian/core-web-vitals": "6.0.0", "@guardian/eslint-config-typescript": "9.0.1", "@guardian/identity-auth": "3.0.0", diff --git a/yarn.lock b/yarn.lock index 5c17a2afecf..1ef4ebac67a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3607,9 +3607,9 @@ __metadata: languageName: node linkType: hard -"@guardian/commercial@npm:23.7.0": - version: 23.7.0 - resolution: "@guardian/commercial@npm:23.7.0" +"@guardian/commercial@npm:23.7.1": + version: 23.7.1 + resolution: "@guardian/commercial@npm:23.7.1" dependencies: "@guardian/prebid.js": "npm:8.52.0-8" "@octokit/core": "npm:^6.1.2" @@ -3626,7 +3626,7 @@ __metadata: "@guardian/libs": ^19.1.0 "@guardian/source": ^8.0.0 typescript: ~5.5.3 - checksum: 10c0/0cdff54bd95d094329fe9210a44c6717b36fd8fe364f4ebbd1a8d48eea929d883895b837e6257befa413d3da8ddec85519746bbd2bbcbce33d58d33d17203884 + checksum: 10c0/a065f7201a0c77831191b654c002b4c075b7626840bfcf45993bcaeab052c55f50abc424aca78eeefe4f89a4c2107786ddbdc5d4c41b29dacc6722da233ab537 languageName: node linkType: hard @@ -3699,7 +3699,7 @@ __metadata: "@emotion/react": "npm:11.11.1" "@emotion/styled": "npm:^10.0.27" "@guardian/ab-core": "npm:8.0.0" - "@guardian/commercial": "npm:23.7.0" + "@guardian/commercial": "npm:23.7.1" "@guardian/core-web-vitals": "npm:6.0.0" "@guardian/eslint-config-typescript": "npm:9.0.1" "@guardian/identity-auth": "npm:3.0.0" From cc8dd30194319ffd2a08e6c30f40909b98f9a567 Mon Sep 17 00:00:00 2001 From: DanielCliftonGuardian <110032454+DanielCliftonGuardian@users.noreply.github.com> Date: Wed, 20 Nov 2024 13:51:50 +0000 Subject: [PATCH 11/12] Use CacheTime.Default --- common/app/renderers/DotcomRenderingService.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/app/renderers/DotcomRenderingService.scala b/common/app/renderers/DotcomRenderingService.scala index 36aabed2010..32d7e067a59 100644 --- a/common/app/renderers/DotcomRenderingService.scala +++ b/common/app/renderers/DotcomRenderingService.scala @@ -424,7 +424,7 @@ class DotcomRenderingService extends GuLogging with ResultWithPreconnectPreload crosswords: EditionsCrosswordRenderingDataModel, )(implicit request: RequestHeader): Future[Result] = { val json = EditionsCrosswordRenderingDataModel.toJson(crosswords) - post(ws, json, Configuration.rendering.articleBaseURL + "/EditionsCrossword", CacheTime.Facia) + post(ws, json, Configuration.rendering.articleBaseURL + "/EditionsCrossword", CacheTime.Default) } } From e40345294ea31ee0ad4b2a9c111e641596e414ff Mon Sep 17 00:00:00 2001 From: Demetrios Skamiotis Date: Wed, 20 Nov 2024 16:41:08 +0000 Subject: [PATCH 12/12] bump comercial version for gpid in prebid --- package.json | 2 +- yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index db796d56dee..121e1ec389a 100644 --- a/package.json +++ b/package.json @@ -28,7 +28,7 @@ "@emotion/react": "11.11.1", "@emotion/styled": "^10.0.27", "@guardian/ab-core": "8.0.0", - "@guardian/commercial": "23.7.1", + "@guardian/commercial": "23.7.2", "@guardian/core-web-vitals": "6.0.0", "@guardian/eslint-config-typescript": "9.0.1", "@guardian/identity-auth": "3.0.0", diff --git a/yarn.lock b/yarn.lock index 1ef4ebac67a..51ba4918e91 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3607,9 +3607,9 @@ __metadata: languageName: node linkType: hard -"@guardian/commercial@npm:23.7.1": - version: 23.7.1 - resolution: "@guardian/commercial@npm:23.7.1" +"@guardian/commercial@npm:23.7.2": + version: 23.7.2 + resolution: "@guardian/commercial@npm:23.7.2" dependencies: "@guardian/prebid.js": "npm:8.52.0-8" "@octokit/core": "npm:^6.1.2" @@ -3626,7 +3626,7 @@ __metadata: "@guardian/libs": ^19.1.0 "@guardian/source": ^8.0.0 typescript: ~5.5.3 - checksum: 10c0/a065f7201a0c77831191b654c002b4c075b7626840bfcf45993bcaeab052c55f50abc424aca78eeefe4f89a4c2107786ddbdc5d4c41b29dacc6722da233ab537 + checksum: 10c0/bdf9180e0f21be2571e406c307ba4d8d5af343eccbc07ad1c81fd1124f670f87cf7ac1233f9695ee87af36ed09b747acd08fe78ff5b61a3c31cb74d1a907e5f9 languageName: node linkType: hard @@ -3699,7 +3699,7 @@ __metadata: "@emotion/react": "npm:11.11.1" "@emotion/styled": "npm:^10.0.27" "@guardian/ab-core": "npm:8.0.0" - "@guardian/commercial": "npm:23.7.1" + "@guardian/commercial": "npm:23.7.2" "@guardian/core-web-vitals": "npm:6.0.0" "@guardian/eslint-config-typescript": "npm:9.0.1" "@guardian/identity-auth": "npm:3.0.0"