Skip to content

Commit

Permalink
Merge pull request #787 from xeroxinteractive/next
Browse files Browse the repository at this point in the history
Release next
  • Loading branch information
AndrewLeedham authored Nov 10, 2023
2 parents c4830b5 + 4e36a78 commit 0c3a4e8
Show file tree
Hide file tree
Showing 11 changed files with 2,737 additions and 1,321 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ jobs:

strategy:
matrix:
node-version: [14.x, 16.x, 18.x]
node-version: [16.x, 18.x, 20.x]

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 0
- uses: nrwl/nx-set-shas@v3
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
ssh-key: ${{ secrets.SSH_PRIVATE_KEY }}
- name: Prepare repository
Expand All @@ -21,7 +21,7 @@ jobs:
main-branch-name: 'next'
- uses: actions/setup-node@v3
with:
node-version: 16.x
node-version: 18.x
- uses: bahmutov/npm-install@v1
- run: yarn global add nx
- run: nx affected:lint
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/sync-labels.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: micnncim/action-label-syncer@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
Expand Down
50 changes: 25 additions & 25 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,51 +13,51 @@
"author": "Andrew Leedham <Andrew.Leedham@xerox.com>",
"license": "MIT",
"engines": {
"node": ">=14"
"node": ">=16"
},
"scripts": {
"test": "nx run-many --all --target=test",
"lint": "nx run-many --all --target=lint",
"build": "nx run-many --all --target=build"
},
"devDependencies": {
"@auto-it/slack": "10.46.0",
"@auto-it/slack": "11.0.4",
"@changesets/cli": "2.26.2",
"@nrwl/cli": "15.9.3",
"@nrwl/jest": "16.5.1",
"@nrwl/js": "16.5.1",
"@nrwl/linter": "16.5.1",
"@nrwl/node": "16.5.1",
"@nrwl/nx-cloud": "16.1.0",
"@nrwl/workspace": "16.5.1",
"@types/jest": "29.5.1",
"@types/node": "18.16.19",
"@types/node-fetch": "2.6.4",
"@types/semver": "7.5.0",
"@xerox/eslint-config": "5.0.3",
"@xerox/prettier-config": "4.0.0",
"auto": "10.46.0",
"eslint": "8.44.0",
"eslint-import-resolver-typescript": "3.5.5",
"eslint-plugin-import": "2.27.5",
"jest": "29.5.0",
"jest-circus": "29.5.0",
"@nrwl/jest": "16.10.0",
"@nrwl/js": "16.10.0",
"@nrwl/linter": "16.10.0",
"@nrwl/node": "16.10.0",
"@nrwl/nx-cloud": "16.5.2",
"@nrwl/workspace": "16.10.0",
"@types/jest": "29.5.5",
"@types/node": "18.18.5",
"@types/node-fetch": "2.6.6",
"@types/semver": "7.5.3",
"@xerox/eslint-config": "5.0.6",
"@xerox/prettier-config": "4.0.3",
"auto": "11.0.4",
"eslint": "8.51.0",
"eslint-import-resolver-typescript": "3.6.1",
"eslint-plugin-import": "2.28.1",
"jest": "29.7.0",
"jest-circus": "29.7.0",
"jest-package-audit": "5.0.3",
"lerna": "7.1.3",
"lerna": "7.3.1",
"mockdate": "3.0.5",
"nx": "16.5.1",
"prettier": "2.8.8",
"nx": "16.10.0",
"prettier": "3.0.3",
"ts-jest": "29.1.1",
"ts-node": "10.9.1",
"typescript": "5.1.6"
"typescript": "5.2.2"
},
"private": true,
"workspaces": [
"packages/*",
"root"
],
"dependencies": {
"tslib": "2.6.0"
"tslib": "2.6.2"
},
"resolutions": {
"jsonwebtoken": ">=9.0.0"
Expand Down
11 changes: 7 additions & 4 deletions packages/adobe-analytics/library/__tests__/index.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -62,10 +62,13 @@ describe('writeBrowserslistStats', () => {
beforeAll(() => {
genericStats = Object.entries(getBaseStats()).reduce(
(browsers, [key, value]) => {
browsers[key] = Object.keys(value).reduce((versions, cur) => {
versions[cur] = expect.any(Number);
return versions;
}, {} as { [version: string]: number });
browsers[key] = Object.keys(value).reduce(
(versions, cur) => {
versions[cur] = expect.any(Number);
return versions;
},
{} as { [version: string]: number }
);
return browsers;
},
{} as GenericStats
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ test('HTTP error', async () => {
ok: false,
statusText: 'Forbidden',
status: 403,
} as Partial<Response> as Response)
}) as Partial<Response> as Response
);
await expect(getAnalyticsResponse(mockOptions)).rejects.toThrow(
new ResponseError('Forbidden', 403)
Expand All @@ -69,7 +69,7 @@ test('Fetch error', async () => {
throw mockFetchError;
},
ok: true,
} as Partial<Response> as Response)
}) as Partial<Response> as Response
);
await expect(getAnalyticsResponse(mockOptions)).rejects.toThrow(
mockFetchError
Expand Down
11 changes: 7 additions & 4 deletions packages/adobe-analytics/library/library/getBaseStats.ts
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,13 @@ export default function getBaseStats(): Stats {
return b[1] - a[1];
}
})
.reduce((versions, [version]) => {
versions[version] = 0;
return versions;
}, {} as { [version: string]: number });
.reduce(
(versions, [version]) => {
versions[version] = 0;
return versions;
},
{} as { [version: string]: number }
);
}
return stats;
}, baseStats);
Expand Down
10 changes: 5 additions & 5 deletions packages/adobe-analytics/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,17 +20,17 @@
"license": "MIT",
"type": "commonjs",
"engines": {
"node": ">=14"
"node": ">=16"
},
"dependencies": {
"@types/caniuse-lite": "*",
"@adobe/jwt-auth": "*",
"@types/yargs": "*",
"browserslist": "4.21.9",
"caniuse-lite": "1.0.30001515",
"browserslist": "4.22.1",
"caniuse-lite": "1.0.30001549",
"moment": "2.29.4",
"node-fetch": "2.6.12",
"ora": "6.3.1",
"node-fetch": "2.7.0",
"ora": "7.0.1",
"semver": "7.5.4",
"yargs": "17.7.2"
}
Expand Down
4 changes: 2 additions & 2 deletions packages/browserstack/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
},
"dependencies": {
"@types/node-fetch": "*",
"browserslist": "4.21.9",
"node-fetch": "2.6.12"
"browserslist": "4.22.1",
"node-fetch": "2.7.0"
}
}
5 changes: 1 addition & 4 deletions renovate.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,6 @@
"labels": [
"change: dependencies"
],
"reviewers": [
"AndrewLeedham"
],
"schedule": [
"before 9am on the 15th day of the month"
],
Expand All @@ -28,4 +25,4 @@
":semanticCommitsDisabled",
"workarounds:all"
]
}
}
Loading

0 comments on commit 0c3a4e8

Please sign in to comment.