Merge branch 'master' into feature/RS-Reskin-2024

penske-media-corp · Sep 4, 2024 · be951e7 · be951e7
2 parents 4868579 + 15fd9e6
commit be951e7
Show file tree

Hide file tree

Showing 41 changed files with 232 additions and 156 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unpublished Changes
 
+## 1.66.0 09-03-2024
+* Update Connatix script tag to use pmcCnx
+* Update out sync package-lock.json
+
 ## 1.65.0 07-01-2024
 * larva-tokens adding new colors for Deadline tokens.
 * Update Vibe token values

diff --git a/build/js/standalone/video-showcase.js b/build/js/standalone/video-showcase.js
diff --git a/build/tokens/deadline.custom-properties.css b/build/tokens/deadline.custom-properties.css
diff --git a/build/tokens/deadline.json b/build/tokens/deadline.json
@@ -513,5 +513,9 @@
   "PRIMARY_L_LINE_HEIGHT_MOBILE": "34px",
   "BODY_L_LINE_HEIGHT_MOBILE": "initial",
   "FONT_FAMILY_ACCENT": "Verdana, serif",
-  "FONT_FAMILY_ACCENT_FANCY": "Verdana, sans-serif"
+  "FONT_FAMILY_ACCENT_FANCY": "Verdana, sans-serif",
+  "COLOR_LIGHT_GREY": "rgb(247, 247, 247)",
+  "COLOR_LIGHT_PINK": "rgb(245, 223, 221)",
+  "COLOR_LIGHT_BEIGE": "rgb(239, 235, 220)",
+  "COLOR_LIGHT_BLUE": "rgb(241, 248, 252)"
 }
diff --git a/build/tokens/deadline.map.scss b/build/tokens/deadline.map.scss
@@ -530,4 +530,8 @@ $deadline-map: (
   'body-l-line-height-mobile': (initial),
   'font-family-accent': (Verdana, serif),
   'font-family-accent-fancy': (Verdana, sans-serif),
+  'color-light-grey': (rgb(247, 247, 247)),
+  'color-light-pink': (rgb(245, 223, 221)),
+  'color-light-beige': (rgb(239, 235, 220)),
+  'color-light-blue': (rgb(241, 248, 252)),
 );
diff --git a/build/tokens/deadline.raw.json b/build/tokens/deadline.raw.json
@@ -4199,6 +4199,34 @@
       "category": "font-family",
       "originalValue": "Verdana, sans-serif",
       "name": "FONT_FAMILY_ACCENT_FANCY"
+    },
+    "COLOR_LIGHT_GREY": {
+      "category": "text-color",
+      "type": "color",
+      "value": "rgb(247, 247, 247)",
+      "originalValue": "rgb(247, 247, 247)",
+      "name": "COLOR_LIGHT_GREY"
+    },
+    "COLOR_LIGHT_PINK": {
+      "category": "text-color",
+      "type": "color",
+      "value": "rgb(245, 223, 221)",
+      "originalValue": "rgb(245, 223, 221)",
+      "name": "COLOR_LIGHT_PINK"
+    },
+    "COLOR_LIGHT_BEIGE": {
+      "category": "text-color",
+      "type": "color",
+      "value": "rgb(239, 235, 220)",
+      "originalValue": "rgb(239, 235, 220)",
+      "name": "COLOR_LIGHT_BEIGE"
+    },
+    "COLOR_LIGHT_BLUE": {
+      "category": "text-color",
+      "type": "color",
+      "value": "rgb(241, 248, 252)",
+      "originalValue": "rgb(241, 248, 252)",
+      "name": "COLOR_LIGHT_BLUE"
     }
   }
 }
diff --git a/lerna.json b/lerna.json
@@ -2,5 +2,5 @@
   "packages": [
     "packages/*"
   ],
-  "version": "1.65.0"
+  "version": "1.66.0"
 }
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/backstopjs-config/package-lock.json b/packages/backstopjs-config/package-lock.json
diff --git a/packages/backstopjs-config/package.json b/packages/backstopjs-config/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@penskemediacorp/backstopjs-config",
-  "version": "1.65.0",
+  "version": "1.66.0",
   "description": "Visual regression testing with Backstop JS.",
   "author": "laras126 <[email protected]>",
   "homepage": "https://github.com/penske-media-corp/pmc-larva#readme",

diff --git a/packages/eslint-config/package-lock.json b/packages/eslint-config/package-lock.json
diff --git a/packages/eslint-config/package.json b/packages/eslint-config/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@penskemediacorp/eslint-config",
-  "version": "1.65.0",
+  "version": "1.66.0",
   "description": "Eslint base config and customizations.",
   "keywords": [
     "eslint",

diff --git a/packages/larva-css/package-lock.json b/packages/larva-css/package-lock.json
diff --git a/packages/larva-css/package.json b/packages/larva-css/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@penskemediacorp/larva-css",
-  "version": "1.65.0",
+  "version": "1.66.0",
   "description": "Larva CSS.",
   "author": "laras126 <[email protected]>",
   "homepage": "https://github.com/penske-media-corp/pmc-larva#readme",
@@ -23,8 +23,8 @@
   },
   "//": "DEPENDENCIES NOTES: Do not upgrade 'del' past 6 unless migrating entire app to module 'type'",
   "devDependencies": {
-    "@penskemediacorp/larva-scss": "^1.65.0",
-    "@penskemediacorp/larva-tokens": "^1.65.0",
+    "@penskemediacorp/larva-scss": "^1.66.0",
+    "@penskemediacorp/larva-tokens": "^1.66.0",
     "del": "^6",
     "fs-extra": "^11",
     "gulp": "^4",

diff --git a/packages/larva-js/build/video-showcase.js b/packages/larva-js/build/video-showcase.js
diff --git a/packages/larva-js/package-lock.json b/packages/larva-js/package-lock.json
diff --git a/packages/larva-js/package.json b/packages/larva-js/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@penskemediacorp/larva-js",
-	"version": "1.65.0",
+	"version": "1.66.0",
 	"description": "Larva JS patterns.",
 	"author": "laras126 <[email protected]>",
 	"homepage": "https://github.com/penske-media-corp/pmc-larva#readme",

diff --git a/packages/larva-js/src/interface/VideoShowcase/VideoShowcase.js b/packages/larva-js/src/interface/VideoShowcase/VideoShowcase.js
@@ -261,12 +261,12 @@ export default class VideoShowcase {
 		new Image().src =
 			'https://capi.elements.video/tr/si?token=094029a3-814c-41d5-8a62-2c3adc647176&cid=1ffe63de-eb53-11e9-b4d2-06948452ae1a';
 		// eslint-disable-next-line no-undef
-		cnx.cmd.push(function () {
+		pmcCnx.cmd.push(function () {
 			// eslint-disable-next-line no-undef
-			cnx({
+			pmcCnx({
 				playerId,
 				mediaId,
-			}).render(eleId);
+			}).render(eleId).play();
 		});
 	}