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

Chore / maintenance 2024 q4 #656

Merged
merged 20 commits into from
Dec 4, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
56b59fb
chore: add access bridge test env
ChristiaanScheermeijer Nov 29, 2024
b8d04a4
chore: upgrade yup to 1.4.0
ChristiaanScheermeijer Nov 29, 2024
1c5008f
chore: upgrade date-fns to 4.1.0
ChristiaanScheermeijer Nov 29, 2024
1ba32c5
chore: upgrade marked to 15.0.3
ChristiaanScheermeijer Nov 29, 2024
1e07f67
chore: upgrade i18next to 24.0.2 and react-i18next to 15.1.3
ChristiaanScheermeijer Nov 29, 2024
7a631f3
chore: upgrade vite to 5.4.11
ChristiaanScheermeijer Nov 29, 2024
cd9c8d4
chore: upgrade vitest to 2.1.6
ChristiaanScheermeijer Nov 29, 2024
5214a32
chore: add resolution for vite 5.4.11
ChristiaanScheermeijer Nov 29, 2024
f7b36c9
chore: upgrade commitlint to 19.6.0
ChristiaanScheermeijer Dec 2, 2024
1a3b791
chore: update workflows to node 22
ChristiaanScheermeijer Dec 2, 2024
aa332f2
chore: upgrade typescript to 5.7.2
ChristiaanScheermeijer Dec 2, 2024
d6b790b
chore: align monorepo dependencies
ChristiaanScheermeijer Dec 2, 2024
4bfe6a4
chore: fix linting errors
ChristiaanScheermeijer Dec 2, 2024
4d3f1ad
chore: fix security vulnerabilities
ChristiaanScheermeijer Dec 3, 2024
dd89a76
chore(deps): upgrade dependencies
ChristiaanScheermeijer Dec 3, 2024
22fd9a9
chore: upgrade to sass-embedded
ChristiaanScheermeijer Dec 3, 2024
3046215
chore: fix sass deprecation warnings
ChristiaanScheermeijer Dec 3, 2024
3ea8cde
refactor: modernize mobile-web-app-capable
ChristiaanScheermeijer Dec 3, 2024
32cf75f
chore: fix zustand deprecation warning
ChristiaanScheermeijer Dec 3, 2024
d00edb1
chore: fix unit test problems and deprecation warnings
ChristiaanScheermeijer Dec 3, 2024
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
1 change: 1 addition & 0 deletions .commitlintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ module.exports = {
2,
'always',
[
'deps',
'project',
'home',
'playlist',
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-linting.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
- name: Use Node.js
uses: actions/setup-node@v4
with:
node-version: '20.x'
node-version: '22.x'
- name: yarn install, lint
run: |
yarn install
Expand Down
10 changes: 1 addition & 9 deletions .github/workflows/test-unit-snapshot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,18 +14,10 @@ jobs:
- name: Use Node.js
uses: actions/setup-node@v4
with:
node-version: '20.x'
node-version: '22.x'
- name: yarn install and test
run: |
yarn
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
2 changes: 1 addition & 1 deletion .github/workflows/web-test-deploy-preview-aws.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: '20'
node-version: '22'
- name: Install packages
run: yarn install --frozen-lockfile
- name: Build
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/web-test-e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
- name: Use Node.js
uses: actions/setup-node@v4
with:
node-version: '20.x'
node-version: '22.x'
- name: Install dependencies
run: |
yarn
Expand Down
8 changes: 4 additions & 4 deletions configs/eslint-config-jwp/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@
"test": "exit 0"
},
"devDependencies": {
"@typescript-eslint/eslint-plugin": "^7.13.1",
"@typescript-eslint/parser": "^7.13.1",
"@typescript-eslint/eslint-plugin": "^8.17.0",
"@typescript-eslint/parser": "^8.17.0",
"confusing-browser-globals": "^1.0.11",
"eslint-plugin-import": "^2.29.1",
"eslint-plugin-react": "^7.34.3",
"eslint-plugin-import": "^2.31.0",
"eslint-plugin-react": "^7.37.2",
"eslint-plugin-react-hooks": "^4.6.2"
}
}
5 changes: 1 addition & 4 deletions configs/eslint-config-jwp/typescript.js
Original file line number Diff line number Diff line change
Expand Up @@ -71,17 +71,14 @@ module.exports = {
},
rules: {
// `require` is still allowed/recommended in JS
'@typescript-eslint/no-var-requires': 'off',
'@typescript-eslint/no-require-imports': 'off',
},
},
{
files: ['*.ts', '*.tsx'],
rules: {
// These are handled by TS
'@typescript-eslint/no-explicit-any': ['warn', { ignoreRestArgs: true }],
'@typescript-eslint/explicit-module-boundary-types': 'off',
'@typescript-eslint/no-inferrable-types': 'off',
'@typescript-eslint/ban-ts-comment': 'off',
'@typescript-eslint/no-unused-vars': 'off',
'import/no-unresolved': 'off',
},
Expand Down
2 changes: 1 addition & 1 deletion configs/postcss-config-jwp/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"test": "exit 0"
},
"devDependencies": {
"postcss": "^8.4.38",
"postcss": "^8.4.49",
"postcss-import": "^14.1.0",
"postcss-scss": "^4.0.9",
"stylelint": "^15.11.0"
Expand Down
8 changes: 4 additions & 4 deletions configs/stylelint-config-jwp/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -242,15 +242,15 @@ module.exports = (function () {
'custom-properties',
'dollar-variables',

// Any mixins
// Style declarations
'declarations',

// Includes
{
type: 'at-rule',
name: 'include',
},

// Style declarations
'declarations',

// Pseudo elements
{
type: 'rule',
Expand Down
2 changes: 1 addition & 1 deletion configs/stylelint-config-jwp/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"devDependencies": {
"stylelint": "^15.11.0",
"stylelint-config-recommended-scss": "^13.1.0",
"stylelint-declaration-strict-value": "^1.10.4",
"stylelint-declaration-strict-value": "^1.10.6",
"stylelint-order": "^6.0.4",
"stylelint-scss": "^5.3.2"
}
Expand Down
8 changes: 3 additions & 5 deletions knip.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ const config: KnipConfig = {
ignoreBinaries: [
// false positives from yarn scripts in github actions
'build',
'global',
'start:test',
'codecept:*',
],
Expand All @@ -22,7 +21,8 @@ const config: KnipConfig = {
'packages/ui-react': {
entry: ['src/**/*'],
ignoreDependencies: [
'sass', // Used in css
'sass-embedded', // Used in Vite
'postcss-config-jwp', // Used in postcss.config
],
},
'platforms/web': {
Expand All @@ -31,17 +31,15 @@ const config: KnipConfig = {
'@codeceptjs/configure', // Used in e2e tests
'@babel/plugin-proposal-decorators', // Used to build with decorators for ioc resolution
'@babel/core', // Required peer dependency for babel plugins
'@jwp/ott-testing', // Used in e2e testing
'@types/luxon', // Used in tests
'babel-plugin-transform-typescript-metadata', // Used to build with decorators for ioc resolution
'core-js', // Conditionally imported at build time
'eslint-plugin-codeceptjs', // Used by apps/web/test-e2e/.eslintrc.cjs
'i18next-parser',
'luxon', // Used in tests
'playwright', // Used in test configs
'sharp', // Requirement for @vite-pwa/assets-generator
'tsconfig-paths', // Used for e2e test setup
'virtual:pwa-register', // Service Worker code is injected at build time
'virtual:polyfills', // Polyfills are conditionally injected
],
},
'configs/eslint-config-jwp': {
Expand Down
25 changes: 14 additions & 11 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,28 +37,31 @@
"access-bridge": "yarn --cwd platforms/access-bridge"
},
"devDependencies": {
"@commitlint/cli": "^17.8.1",
"@commitlint/config-conventional": "^17.8.1",
"@types/node": "^18.19.37",
"csv-parse": "^5.5.6",
"eslint": "^8.57.0",
"@commitlint/cli": "^19.6.0",
"@commitlint/config-conventional": "^19.6.0",
"@types/node": "^22.10.1",
"csv-parse": "^5.6.0",
"eslint": "^8.57.1",
"eslint-config-jwp": "*",
"husky": "^6.0.0",
"i18next-parser-workspaces": "^0.2.0",
"knip": "^5.30.1",
"knip": "^5.39.1",
"lint-staged": "^15.2.10",
"npm-run-all": "^4.1.5",
"prettier": "^2.8.8",
"read": "^2.1.0",
"ts-node": "^10.9.2",
"typescript": "5.3.3",
"vitest": "^1.6.0"
},
"peerDependencies": {
"eslint-config-jwp": "*"
"typescript": "5.7.2",
"vitest": "^2.1.8"
},
"resolutions": {
"axios": "^0.29.0",
"codeceptjs/**/fast-xml-parser": "^4.5.0",
"eslint/**/cross-spawn": "^7.0.6",
"lint-staged/**/cross-spawn": "^7.0.6",
"npm-run-all/**/cross-spawn": "^6.0.6",
"micromatch": ">=4.0.8",
"vitest/**/vite": "^5.4.11",
"ws": ">=5.2.4"
}
}
19 changes: 8 additions & 11 deletions packages/common/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,29 +10,26 @@
},
"dependencies": {
"@inplayer-org/inplayer.js": "^3.13.28",
"date-fns": "^3.6.0",
"date-fns": "^4.1.0",
"fast-xml-parser": "^4.5.0",
"i18next": "^22.5.1",
"i18next": "^24.0.5",
"ini": "^3.0.1",
"inversify": "^6.0.2",
"inversify": "^6.1.5",
"jwt-decode": "^4.0.0",
"lodash.merge": "^4.6.2",
"react-i18next": "^12.3.1",
"react-i18next": "^15.1.3",
"reflect-metadata": "^0.2.2",
"yup": "^0.32.11",
"yup": "^1.4.0",
"zustand": "^4.5.5"
},
"devDependencies": {
"@jwp/ott-testing": "*",
"@types/ini": "^1.3.34",
"@types/lodash.merge": "^4.6.9",
"eslint-config-jwp": "*",
"jsdom": "^22.1.0",
"timezone-mock": "^1.3.6",
"vi-fetch": "^0.8.0",
"vitest": "^1.6.0"
},
"peerDependencies": {
"@jwp/ott-testing": "*",
"@jwp/ott-theme": "*",
"eslint-config-jwp": "*"
"vitest": "^2.1.8"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,8 @@ export default class JWPSubscriptionService extends SubscriptionService {
case 'canceled':
status = 'cancelled';
break;
case 'incomplete_expired' || 'ended':
case 'incomplete_expired':
case 'ended':
status = 'expired';
break;
default:
Expand Down
6 changes: 3 additions & 3 deletions packages/common/src/stores/utils.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import type { StateCreator } from 'zustand';
import { create } from 'zustand';
import { createWithEqualityFn } from 'zustand/traditional';
import { devtools, subscribeWithSelector } from 'zustand/middleware';

import { IS_DEVELOPMENT_BUILD, IS_TEST_MODE } from '../utils/common';
Expand All @@ -9,13 +9,13 @@ export const createStore = <T>(name: string, storeFn: StateCreator<T>) => {

// https://github.com/pmndrs/zustand/issues/852#issuecomment-1059783350
if (IS_DEVELOPMENT_BUILD && !IS_TEST_MODE) {
return create(
return createWithEqualityFn(
devtools(store, {
name,
anonymousActionType: `${name}/Action`,
}),
);
}

return create(store);
return createWithEqualityFn(store);
};
Loading
Loading