Skip to content

Commit bad20c2

Browse files
axinom-geethakaaxinom-geethaka
authored
[AB#49721] Chore: update yarn version (#470)
* chore: update yarn version and run yarn install * fix: add node-fetch types to entitlement service * fix: convert yarn info command to new format * chore: update the mosaic-service-common package and the other packages depending on it the to latest prerelease version * fix: convert yarn commands to modern versions * fix: add missing dev dep `concurrently` to catalog service * fix: add supported Archs to `yarnrc.yml` * fix: disable erroneous build scripts from `hyperjump` packages * fix: move mosaic-portal to import maps from peer deps in media and channel workflows * fix: move url-join into deps from dev deps in media service
1 parent 048e8c2 commit bad20c2

File tree

13 files changed

+22738
-15255
lines changed

13 files changed

+22738
-15255
lines changed

‎.yarn/releases/yarn-4.9.4.cjs‎

Lines changed: 942 additions & 0 deletions
Large diffs are not rendered by default.

‎.yarnrc.yml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
nodeLinker: node-modules
2+
3+
supportedArchitectures:
4+
cpu: ['current', 'x64', 'arm64']
5+
libc: ['current', 'glibc', 'musl']
6+
os: ['current', 'linux', 'darwin']
7+
8+
yarnPath: .yarn/releases/yarn-4.9.4.cjs

‎libs/media-messages/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"build:compile": "tsc"
2222
},
2323
"devDependencies": {
24-
"@axinom/mosaic-cli": "0.49.0",
24+
"@axinom/mosaic-cli": "0.50.0-rc.3",
2525
"@axinom/mosaic-message-bus-abstractions": "0.24.0",
2626
"@types/glob": "^7.2.0",
2727
"chokidar-cli": "^3.0.0",
@@ -31,4 +31,4 @@
3131
"tsc-watch": "^4.6.2",
3232
"typescript": "^4.9.4"
3333
}
34-
}
34+
}

‎package.json‎

Lines changed: 23 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -45,18 +45,18 @@
4545
"util:update-packages": "yarn upgrade-interactive && ts-node ./scripts/sync-package-jsons.ts && yarn",
4646
"util:update-mosaic-packages": "ts-node ./scripts/update-mosaic-packages.ts",
4747
"util:update-snippets": "mosaic generate-vscode-sql-snippets",
48-
"build:media-service:prod": "yarn && wsrun -trm -p media-service -c build && yarn install --prod",
49-
"build:catalog-service:prod": "yarn && wsrun -trm -p catalog-service -c build && yarn install --prod",
50-
"build:entitlement-service:prod": "yarn && wsrun -trm -p entitlement-service -c build && yarn install --prod",
51-
"build:channel-service:prod": "yarn && wsrun -trm -p channel-service -c build && yarn install --prod",
52-
"build:vod-to-live-service:prod": "yarn && wsrun -trm -p vod-to-live-service -c build && yarn install --prod",
53-
"build:media-workflows:prod": "yarn && wsrun -trm -p media-workflows -c build && pilet pack services/media/workflows",
54-
"build:channel-workflows:prod": "yarn && wsrun -trm -p channel-workflows -c build && pilet pack services/channel/workflows",
48+
"build:media-service:prod": "yarn workspaces focus media-template media-service && yarn wsrun -trm -p media-service -c build && yarn workspaces focus --production media-service",
49+
"build:catalog-service:prod": "yarn workspaces focus media-template catalog-service && yarn wsrun -trm -p catalog-service -c build && yarn workspaces focus --production catalog-service",
50+
"build:entitlement-service:prod": "yarn workspaces focus media-template entitlement-service && yarn wsrun -trm -p entitlement-service -c build && yarn workspaces focus --production entitlement-service",
51+
"build:channel-service:prod": "yarn workspaces focus media-template channel-service && yarn wsrun -trm -p channel-service -c build && yarn workspaces focus --production channel-service",
52+
"build:vod-to-live-service:prod": "yarn workspaces focus media-template vod-to-live-service && yarn wsrun -trm -p vod-to-live-service -c build && yarn workspaces focus --production vod-to-live-service",
53+
"build:media-workflows:prod": "yarn workspaces focus media-template media-workflows && yarn wsrun -trm -p media-workflows -c build && pilet pack services/media/workflows",
54+
"build:channel-workflows:prod": "yarn workspaces focus media-template channel-workflows && yarn wsrun -trm -p channel-workflows -c build && pilet pack services/channel/workflows",
5555
"setup:hosting": "yarn util:load-vars ts-node ./scripts/setup-hosting.ts",
5656
"yarn:de-dupe": "npx yarn-deduplicate yarn.lock"
5757
},
5858
"devDependencies": {
59-
"@axinom/mosaic-cli": "0.49.0",
59+
"@axinom/mosaic-cli": "0.50.0-rc.3",
6060
"@jest/globals": "^29.5.0",
6161
"@types/jest": "^29.4.1",
6262
"@types/node": "^18.11.19",
@@ -98,18 +98,29 @@
9898
"rimraf": "^3.0.2",
9999
"semver": "^7.5.4",
100100
"ts-node": "^10.9.1",
101-
"tslib": "2.4.0",
101+
"tslib": "2.5.0",
102102
"typescript": "^4.9.4",
103103
"url-join": "^4.0.1",
104104
"wsrun": "^5.2.4",
105105
"yargs": "^16.2.0"
106106
},
107-
"dependencies": {},
108107
"resolutions": {
109108
"@types/jest": "^29",
110109
"css-loader": "^6.7.3",
111110
"jest": "^29",
112111
"jest-cli": "^29",
113112
"jsonpath-plus": "^10.2.0"
114-
}
115-
}
113+
},
114+
"dependenciesMeta": {
115+
"@hyperjump/json-pointer": {
116+
"built": false
117+
},
118+
"@hyperjump/json-schema-core": {
119+
"built": false
120+
},
121+
"@hyperjump/pact": {
122+
"built": false
123+
}
124+
},
125+
"packageManager": "yarn@4.9.4"
126+
}

‎scripts/package-version-check.ts‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,11 @@ Please run "yarn pilet upgrade" in "%s" to update.`);
2424
async function checkPackageVersion(): Promise<void> {
2525
let latestVersion = '';
2626
try {
27-
latestVersion = execSync(`npm info ${packageName} version`)
28-
.toString()
29-
.trim();
27+
latestVersion = JSON.parse(
28+
execSync(
29+
`yarn npm info ${packageName} --fields version --json`,
30+
).toString(),
31+
).version;
3032
} catch (error) {
3133
console.error(error);
3234
}

‎services/catalog/service/package.json‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -41,14 +41,14 @@
4141
"util:define-func-migration": "yarn mosaic generate-define-func-migration"
4242
},
4343
"dependencies": {
44-
"@axinom/mosaic-db-common": "0.50.0",
45-
"@axinom/mosaic-graphql-common": "0.26.0",
46-
"@axinom/mosaic-id-guard": "0.42.8",
47-
"@axinom/mosaic-messages": "0.60.0",
48-
"@axinom/mosaic-message-bus": "0.43.0",
44+
"@axinom/mosaic-db-common": "0.51.0-rc.3",
45+
"@axinom/mosaic-graphql-common": "0.27.0-rc.3",
46+
"@axinom/mosaic-id-guard": "0.42.9-rc.3",
47+
"@axinom/mosaic-message-bus": "0.44.0-rc.3",
4948
"@axinom/mosaic-message-bus-abstractions": "0.24.0",
50-
"@axinom/mosaic-service-common": "0.62.0",
51-
"@axinom/mosaic-transactional-inbox-outbox": "0.22.0",
49+
"@axinom/mosaic-messages": "0.61.0-rc.3",
50+
"@axinom/mosaic-service-common": "0.63.0-rc.3",
51+
"@axinom/mosaic-transactional-inbox-outbox": "0.23.0-rc.3",
5252
"@graphile-contrib/pg-simplify-inflector": "^6.1.0",
5353
"add": "^2.0.6",
5454
"dotenv": "^8.6.0",
@@ -75,6 +75,7 @@
7575
"@types/pg": "^8.6.5",
7676
"@types/rascal": "^10.0.6",
7777
"@types/verror": "^1.10.6",
78+
"concurrently": "^6.5.1",
7879
"jest": "^29.5.0",
7980
"jest-extended": "^3.1.0",
8081
"pg-formatter": "^1.3.0",
@@ -85,4 +86,4 @@
8586
"typescript": "^4.9.4",
8687
"uuid": "^8.3.2"
8788
}
88-
}
89+
}

‎services/channel/service/package.json‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -44,16 +44,16 @@
4444
"util:define-func-migration": "yarn mosaic generate-define-func-migration"
4545
},
4646
"dependencies": {
47-
"@axinom/mosaic-db-common": "0.50.0",
48-
"@axinom/mosaic-graphql-common": "0.26.0",
49-
"@axinom/mosaic-id-guard": "0.42.8",
50-
"@axinom/mosaic-id-link-be": "0.32.0",
51-
"@axinom/mosaic-message-bus": "0.43.0",
47+
"@axinom/mosaic-db-common": "0.51.0-rc.3",
48+
"@axinom/mosaic-graphql-common": "0.27.0-rc.3",
49+
"@axinom/mosaic-id-guard": "0.42.9-rc.3",
50+
"@axinom/mosaic-id-link-be": "0.33.0-rc.3",
51+
"@axinom/mosaic-message-bus": "0.44.0-rc.3",
5252
"@axinom/mosaic-message-bus-abstractions": "0.24.0",
53-
"@axinom/mosaic-messages": "0.60.0",
54-
"@axinom/mosaic-service-common": "0.62.0",
55-
"@axinom/mosaic-transactional-inbox-outbox": "0.22.0",
56-
"@axinom/mosaic-video-messages": "0.3.0",
53+
"@axinom/mosaic-messages": "0.61.0-rc.3",
54+
"@axinom/mosaic-service-common": "0.63.0-rc.3",
55+
"@axinom/mosaic-transactional-inbox-outbox": "0.23.0-rc.3",
56+
"@axinom/mosaic-video-messages": "0.4.0-rc.21",
5757
"@graphile-contrib/pg-simplify-inflector": "^6.1.0",
5858
"dotenv": "^8.6.0",
5959
"env-cmd": "^10.1.0",
@@ -82,7 +82,7 @@
8282
"zapatos": "^3.6.0"
8383
},
8484
"devDependencies": {
85-
"@axinom/mosaic-cli": "0.49.0",
85+
"@axinom/mosaic-cli": "0.50.0-rc.3",
8686
"@graphql-codegen/cli": "^4.0.1",
8787
"@graphql-codegen/typescript": "^2.7.3",
8888
"@graphql-codegen/typescript-graphql-request": "^4.5.5",
@@ -105,4 +105,4 @@
105105
"tsc-watch": "^4.6.2",
106106
"typescript": "^4.9.4"
107107
}
108-
}
108+
}

‎services/channel/workflows/package.json‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,12 @@
1010
"mosaic",
1111
"axinom mosaic"
1212
],
13+
"importmap": {
14+
"imports": {},
15+
"inherit": [
16+
"@axinom/mosaic-portal"
17+
]
18+
},
1319
"scripts": {
1420
"clean": "rimraf dist .cache",
1521
"build": "pilet build --source-maps=false",
@@ -70,12 +76,10 @@
7076
"typescript-plugin-css-modules": "^5.0.2"
7177
},
7278
"peerDependencies": {
73-
"@axinom/mosaic-portal": "*",
7479
"react": "*",
7580
"react-dom": "*",
7681
"react-router": "*",
77-
"react-router-dom": "*",
78-
"tslib": "*"
82+
"react-router-dom": "*"
7983
},
8084
"peerModules": []
81-
}
85+
}

‎services/entitlement/service/package.json‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -46,14 +46,14 @@
4646
"util:define-func-migration": "yarn mosaic generate-define-func-migration"
4747
},
4848
"dependencies": {
49-
"@axinom/mosaic-db-common": "0.50.0",
50-
"@axinom/mosaic-graphql-common": "0.26.0",
51-
"@axinom/mosaic-id-guard": "0.42.8",
52-
"@axinom/mosaic-id-utils": "0.23.1",
53-
"@axinom/mosaic-message-bus": "0.43.0",
54-
"@axinom/mosaic-video-messages": "0.3.0",
55-
"@axinom/mosaic-service-common": "0.62.0",
56-
"@axinom/mosaic-transactional-inbox-outbox": "0.22.0",
49+
"@axinom/mosaic-db-common": "0.51.0-rc.3",
50+
"@axinom/mosaic-graphql-common": "0.27.0-rc.3",
51+
"@axinom/mosaic-id-guard": "0.42.9-rc.3",
52+
"@axinom/mosaic-id-utils": "0.23.2-rc.3",
53+
"@axinom/mosaic-message-bus": "0.44.0-rc.3",
54+
"@axinom/mosaic-service-common": "0.63.0-rc.3",
55+
"@axinom/mosaic-transactional-inbox-outbox": "0.23.0-rc.3",
56+
"@axinom/mosaic-video-messages": "0.4.0-rc.21",
5757
"@graphile-contrib/pg-simplify-inflector": "^6.1.0",
5858
"ajv": "^7.2.4",
5959
"ajv-formats": "^1.6.1",
@@ -96,6 +96,7 @@
9696
"@types/jest": "^29.4.1",
9797
"@types/jsonwebtoken": "^9.0.1",
9898
"@types/mock-req-res": "^1.1.3",
99+
"@types/node-fetch": "^2.6.13",
99100
"@types/pg": "^8.6.5",
100101
"@types/pluralize": "^0.0.29",
101102
"@types/rascal": "^10.0.6",
@@ -116,4 +117,4 @@
116117
"ts-node": "^10.9.1",
117118
"tsc-watch": "^4.6.2"
118119
}
119-
}
120+
}

‎services/media/service/package.json‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -45,16 +45,16 @@
4545
"util:define-func-migration": "yarn mosaic generate-define-func-migration"
4646
},
4747
"dependencies": {
48-
"@axinom/mosaic-db-common": "0.50.0",
49-
"@axinom/mosaic-graphql-common": "0.26.0",
50-
"@axinom/mosaic-id-guard": "0.42.8",
51-
"@axinom/mosaic-id-link-be": "0.32.0",
52-
"@axinom/mosaic-message-bus": "0.43.0",
48+
"@axinom/mosaic-db-common": "0.51.0-rc.3",
49+
"@axinom/mosaic-graphql-common": "0.27.0-rc.3",
50+
"@axinom/mosaic-id-guard": "0.42.9-rc.3",
51+
"@axinom/mosaic-id-link-be": "0.33.0-rc.3",
52+
"@axinom/mosaic-message-bus": "0.44.0-rc.3",
5353
"@axinom/mosaic-message-bus-abstractions": "0.24.0",
54-
"@axinom/mosaic-messages": "0.60.0",
55-
"@axinom/mosaic-video-messages": "0.3.0",
56-
"@axinom/mosaic-service-common": "0.62.0",
57-
"@axinom/mosaic-transactional-inbox-outbox": "0.22.0",
54+
"@axinom/mosaic-messages": "0.61.0-rc.3",
55+
"@axinom/mosaic-service-common": "0.63.0-rc.3",
56+
"@axinom/mosaic-transactional-inbox-outbox": "0.23.0-rc.3",
57+
"@axinom/mosaic-video-messages": "0.4.0-rc.21",
5858
"@faker-js/faker": "^7.6.0",
5959
"@graphile-contrib/pg-simplify-inflector": "^6.1.0",
6060
"ajv": "^7.2.4",
@@ -86,6 +86,7 @@
8686
"postgraphile-plugin-connection-filter": "^2.3.0",
8787
"rascal": "^14.4.5",
8888
"typescript": "^4.9.4",
89+
"url-join": "^4.0.1",
8990
"uuid": "^8.3.2",
9091
"yup": "^0.32.11",
9192
"zapatos": "^3.6.0"
@@ -121,7 +122,6 @@
121122
"ts-jest": "^29.0.5",
122123
"ts-node": "^10.9.1",
123124
"tsc-watch": "^4.6.2",
124-
"url-join": "^4.0.1",
125125
"yargs": "^16.2.0"
126126
}
127-
}
127+
}

0 commit comments

Comments
 (0)