Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release Candidate - v6.7.0 #626

Merged
merged 17 commits into from
Sep 27, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion .github/workflows/test-unit-snapshot.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Test - Unit and Snapshot
name: Test - Unit, Integration, Snapshot

on:
push:
Expand All @@ -21,3 +21,11 @@ jobs:
yarn test
env:
CI: true
# Dummy environment variables for testing the access-bridge service
APP_SITE_ID: test1234
APP_API_SECRET: dummy_secret
APP_STRIPE_SECRET: dummy_stripe_secret
APP_BIND_ADDR: localhost
APP_BIND_PORT: 3001
APP_ACCESS_CONTROL_API_HOST: https://test-cdn.jwplayer.com
APP_SIMS_API_HOST: https://test-sims.jwplayer.com
82 changes: 16 additions & 66 deletions .syncpackrc.json
Original file line number Diff line number Diff line change
@@ -1,88 +1,38 @@
{
"$schema": "https://unpkg.com/[email protected]/dist/schema.json",
"sortFirst": [
"name",
"description",
"version",
"private",
"license",
"repository",
"author",
"main",
"exports",
"engines",
"workspaces",
"scripts"
],
"sortFirst": ["name", "description", "version", "private", "license", "repository", "author", "main", "exports", "engines", "workspaces", "scripts"],
"semverGroups": [
{
"dependencies": [
"codeceptjs",
"codeceptjs**",
"react-router",
"react-router-dom",
"typescript"
],
"packages": [
"**"
],
"dependencies": ["codeceptjs", "codeceptjs**", "react-router", "react-router-dom", "typescript"],
"packages": ["**"],
"isIgnored": true
},
{
"range": "^",
"dependencies": [
"**"
],
"packages": [
"**"
],
"dependencyTypes": [
"prod",
"dev",
"peer"
]
"dependencies": ["**"],
"packages": ["**"],
"dependencyTypes": ["prod", "dev", "peer"]
}
],
"versionGroups": [
{
"label": "Ensure semver ranges for locally developed packages satisfy the local version",
"dependencies": [
"@jwp/**",
"**-config-jwp"
],
"dependencyTypes": [
"peer"
],
"packages": [
"**"
],
"dependencies": ["@jwp/**", "**-config-jwp"],
"dependencyTypes": ["dev", "prod", "peer"],
"packages": ["**"],
"pinVersion": "*"
},
{
"label": "Ensure local packages are installed as peerDependency",
"dependencies": [
"@jwp/**",
"**-config-jwp"
],
"dependencyTypes": [
"dev",
"prod"
],
"packages": [
"**"
],
"label": "Ensure local packages are installed as dev or prod dependency",
"dependencies": ["@jwp/**", "**-config-jwp"],
"dependencyTypes": ["peer"],
"packages": ["**"],
"isBanned": true
},
{
"dependencies": [
"@types/**"
],
"dependencyTypes": [
"!dev"
],
"packages": [
"**"
],
"dependencies": ["@types/**"],
"dependencyTypes": ["!dev"],
"packages": ["**"],
"isBanned": true,
"label": "@types packages should only be under devDependencies"
}
Expand Down
20 changes: 20 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,23 @@
## [6.7.0](https://github.com/jwplayer/ott-web-app/compare/v6.6.0...v6.7.0) (2024-09-27)


### Features

* access bridge service ([#616](https://github.com/jwplayer/ott-web-app/issues/616)) ([aae2551](https://github.com/jwplayer/ott-web-app/commit/aae25515bcff0e4ad8428d8b8389220eb9126d5f)), closes [#594](https://github.com/jwplayer/ott-web-app/issues/594) [#598](https://github.com/jwplayer/ott-web-app/issues/598) [#590](https://github.com/jwplayer/ott-web-app/issues/590) [#605](https://github.com/jwplayer/ott-web-app/issues/605) [#606](https://github.com/jwplayer/ott-web-app/issues/606)
* **i18n:** fix lint error ([c27a1e6](https://github.com/jwplayer/ott-web-app/commit/c27a1e69c360d9ebe9abcc9cf2e8bb3a088516aa))
* **menu:** fix support for media menu item ([#621](https://github.com/jwplayer/ott-web-app/issues/621)) ([4ffb849](https://github.com/jwplayer/ott-web-app/commit/4ffb84923424de05f1f62455c7822354c0842173))
* **menu:** support media type for menu ([#610](https://github.com/jwplayer/ott-web-app/issues/610)) ([80acd7f](https://github.com/jwplayer/ott-web-app/commit/80acd7f6c6672baf6e4a01dbecdf8540be68dbd7))
* **project:** screen animations ([#614](https://github.com/jwplayer/ott-web-app/issues/614)) ([edbb246](https://github.com/jwplayer/ott-web-app/commit/edbb246c9edf926b872f5fdeb01d8cc0379f86ae))


### Bug Fixes

* card grid rendering previous items ([#613](https://github.com/jwplayer/ott-web-app/issues/613)) ([dce9f70](https://github.com/jwplayer/ott-web-app/commit/dce9f70875444ad965bb69d87a3f9445883ab9b1))
* **e2e:** fix cleeng tests ([#624](https://github.com/jwplayer/ott-web-app/issues/624)) ([5231d86](https://github.com/jwplayer/ott-web-app/commit/5231d86b1aa05f6424fd8335f805fb42794d2698))
* **project:** demo config reset doesnt work ([#609](https://github.com/jwplayer/ott-web-app/issues/609)) ([003e3e5](https://github.com/jwplayer/ott-web-app/commit/003e3e505929d62f3547c45def885a1b32b32e82))
* **series:** first episode switching per season ([ddedb6b](https://github.com/jwplayer/ott-web-app/commit/ddedb6b6f636c720f0ba016b2fa07b41e964fe8e))
* update plan types and access bridge port for the unit test workflow ([#619](https://github.com/jwplayer/ott-web-app/issues/619)) ([0e51bc4](https://github.com/jwplayer/ott-web-app/commit/0e51bc44288fb1ab2cd55dc8bdeaec8233819043))

## [6.6.0](https://github.com/jwplayer/ott-web-app/compare/v6.5.0...v6.6.0) (2024-09-06)


Expand Down
2 changes: 1 addition & 1 deletion configs/eslint-config-jwp/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"@typescript-eslint/parser": "^7.13.1",
"confusing-browser-globals": "^1.0.11",
"eslint-plugin-import": "^2.29.1",
"eslint-plugin-react": "^7.34.2",
"eslint-plugin-react": "^7.34.3",
"eslint-plugin-react-hooks": "^4.6.2"
}
}
19 changes: 9 additions & 10 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@jwp/ott",
"version": "6.6.0",
"version": "6.7.0",
"private": true,
"license": "Apache-2.0",
"repository": "https://github.com/jwplayer/ott-web-app.git",
Expand Down Expand Up @@ -33,18 +33,19 @@
"prepare": "husky install",
"test": "TZ=UTC LC_ALL=en_US.UTF-8 vitest run",
"test-watch": "TZ=UTC LC_ALL=en_US.UTF-8 vitest",
"web": "yarn --cwd platforms/web"
"web": "yarn --cwd platforms/web",
"access-bridge": "yarn --cwd platforms/access-bridge"
},
"devDependencies": {
"@commitlint/cli": "^17.8.1",
"@commitlint/config-conventional": "^17.8.1",
"@types/node": "^18.19.36",
"@types/node": "^18.19.37",
"csv-parse": "^5.5.6",
"eslint": "^8.57.0",
"husky": "^6.0.0",
"i18next-parser-workspaces": "^0.2.0",
"knip": "^5.21.1",
"lint-staged": "^15.2.7",
"knip": "^5.30.1",
"lint-staged": "^15.2.10",
"npm-run-all": "^4.1.5",
"prettier": "^2.8.8",
"read": "^2.1.0",
Expand All @@ -56,10 +57,8 @@
"eslint-config-jwp": "*"
},
"resolutions": {
"codeceptjs/**/ansi-regex": "^4.1.1",
"codeceptjs/**/minimatch": "^3.0.5",
"flat": "^5.0.1",
"glob-parent": "^5.1.2",
"json5": "^2.2.2"
"codeceptjs/**/fast-xml-parser": "^4.5.0",
"micromatch": ">=4.0.8",
"ws": ">=5.2.4"
}
}
6 changes: 3 additions & 3 deletions packages/common/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
"dependencies": {
"@inplayer-org/inplayer.js": "^3.13.28",
"broadcast-channel": "^7.0.0",
"date-fns": "^2.30.0",
"fast-xml-parser": "^4.4.0",
"date-fns": "^3.6.0",
"fast-xml-parser": "^4.5.0",
"i18next": "^22.5.1",
"ini": "^3.0.1",
"inversify": "^6.0.2",
Expand All @@ -21,7 +21,7 @@
"react-i18next": "^12.3.1",
"reflect-metadata": "^0.2.2",
"yup": "^0.32.11",
"zustand": "^3.7.2"
"zustand": "^4.5.5"
},
"devDependencies": {
"@types/ini": "^1.3.34",
Expand Down
3 changes: 2 additions & 1 deletion packages/common/src/constants.ts
Original file line number Diff line number Diff line change
Expand Up @@ -86,9 +86,10 @@ export const EPG_TYPE = {
viewNexa: 'viewnexa',
} as const;

export const PLAYLIST_TYPE = {
export const APP_CONFIG_ITEM_TYPE = {
playlist: 'playlist',
continue_watching: 'continue_watching',
favorites: 'favorites',
content_list: 'content_list',
media: 'media',
} as const;
Loading
Loading