Skip to content

Commit

Permalink
Merge branch 'main' into dina/add-prebid-magnite
Browse files Browse the repository at this point in the history
  • Loading branch information
deedeeh authored Jul 22, 2024
2 parents d0eabb4 + 25031be commit 4c0bfb3
Show file tree
Hide file tree
Showing 45 changed files with 352 additions and 1,171 deletions.
5 changes: 5 additions & 0 deletions .changeset/healthy-wombats-compete.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@guardian/commercial': major
---

Major bumps to @guardian dependencies
5 changes: 5 additions & 0 deletions .changeset/rotten-vans-dance.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@guardian/commercial': patch
---

replaces current ab test library with @guardian/ab-core
1 change: 1 addition & 0 deletions jest.setupTestFrameworkScriptFile.js
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ window.guardian = {
},
ophan: {
pageViewId: 'dummy_pvid_123456790',
record: jest.fn(),
},
css: {},
adBlockers: {
Expand Down
38 changes: 19 additions & 19 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -50,15 +50,15 @@
"@babel/preset-typescript": "^7.17.12",
"@babel/register": "^7.11.5",
"@babel/runtime": "^7.11.2",
"@guardian/ab-core": "7.0.3",
"@guardian/browserslist-config": "^5.1.0",
"@guardian/core-web-vitals": "6.0.1",
"@guardian/eslint-config-typescript": "^10.0.1",
"@guardian/identity-auth": "^2.1.0",
"@guardian/identity-auth-frontend": "^4.0.0",
"@guardian/libs": "17.0.0",
"@guardian/prettier": "4.0.0",
"@guardian/source-foundations": "14.1.4",
"@guardian/ab-core": "8.0.0",
"@guardian/browserslist-config": "^6.1.1",
"@guardian/core-web-vitals": "7.0.0",
"@guardian/eslint-config-typescript": "^11.0.0",
"@guardian/identity-auth": "^3.0.0",
"@guardian/identity-auth-frontend": "^5.0.0",
"@guardian/libs": "18.0.0",
"@guardian/prettier": "8.0.1",
"@guardian/source": "6.0.0",
"@playwright/test": "1.45.1",
"@types/googletag": "~3.1.3",
"@types/jest": "^29.4.0",
Expand Down Expand Up @@ -88,13 +88,13 @@
"lint-staged": "^13.2.2",
"mockdate": "^3.0.5",
"npm-run-all": "^4.1.5",
"prettier": "^2.5.0",
"prettier": "^3.3.3",
"raw-loader": "^4.0.2",
"terser-webpack-plugin": "^5.3.6",
"ts-jest": "^29.0.5",
"ts-loader": "^9.4.2",
"type-fest": "^4.3.3",
"typescript": "5.3.3",
"typescript": "5.5.3",
"webpack": "^5.76.0",
"webpack-bundle-analyzer": "^4.7.0",
"webpack-cli": "^4.10.0",
Expand All @@ -111,7 +111,7 @@
"process": "^0.11.10",
"raven-js": "^3.27.2",
"tslib": "^2.6.2",
"web-vitals": "^3.3.2",
"web-vitals": "^4.2.1",
"wolfy87-eventemitter": "^5.2.9"
},
"prettier": "@guardian/prettier",
Expand All @@ -125,13 +125,13 @@
"access": "public"
},
"peerDependencies": {
"@guardian/ab-core": "^7.0.1",
"@guardian/core-web-vitals": "^6.0.0",
"@guardian/identity-auth": "^2.1.0",
"@guardian/identity-auth-frontend": "^4.0.0",
"@guardian/libs": "^17.0.0",
"@guardian/source-foundations": "^14.1.2",
"typescript": "~5.3.3"
"@guardian/ab-core": "^8.0.0",
"@guardian/core-web-vitals": "^7.0.0",
"@guardian/identity-auth": "^3.0.0",
"@guardian/identity-auth-frontend": "^5.0.0",
"@guardian/libs": "^18.0.0",
"@guardian/source": "^6.0.0",
"typescript": "~5.5.3"
},
"browserslist": [
"extends @guardian/browserslist-config"
Expand Down
2 changes: 1 addition & 1 deletion playwright/fixtures/breakpoints.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { breakpoints } from '@guardian/source-foundations';
import { breakpoints } from '@guardian/source/foundations';

type BreakpointKeys = Pick<
typeof breakpoints,
Expand Down
2 changes: 1 addition & 1 deletion playwright/tests/comments-expanded.spec.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { breakpoints } from '@guardian/source-foundations';
import { breakpoints } from '@guardian/source/foundations';
import { expect, test } from '@playwright/test';
import { cmpAcceptAll } from '../lib/cmp';
import { loadPage } from '../lib/load-page';
Expand Down
2 changes: 1 addition & 1 deletion playwright/tests/right-slot.spec.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { breakpoints } from '@guardian/source-foundations';
import { breakpoints } from '@guardian/source/foundations';
import { test } from '@playwright/test';
import { allPages } from '../fixtures/pages';
import { cmpAcceptAll } from '../lib/cmp';
Expand Down
Loading

0 comments on commit 4c0bfb3

Please sign in to comment.