From edc833ab29b46aa333b6b11e4a75eca3df8d0278 Mon Sep 17 00:00:00 2001 From: Andy Gallagher Date: Wed, 3 Jul 2024 10:42:03 +0100 Subject: [PATCH 1/2] bump Thrift node library to 0.20.x and re-lock the Node project --- package-lock.json | 72 +++++++++++++++++++++++++++++++++++++++++++++++ package.json | 2 +- 2 files changed, 73 insertions(+), 1 deletion(-) create mode 100644 package-lock.json diff --git a/package-lock.json b/package-lock.json new file mode 100644 index 0000000..f81ab6e --- /dev/null +++ b/package-lock.json @@ -0,0 +1,72 @@ +{ + "name": "guardian-contentatom", + "version": "3.4.4", + "lockfileVersion": 3, + "requires": true, + "packages": { + "": { + "name": "guardian-contentatom", + "version": "3.4.4", + "license": "Apache-2.0", + "dependencies": { + "thrift": "^0.20.0" + } + }, + "node_modules/async-limiter": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.1.tgz", + "integrity": "sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ==" + }, + "node_modules/browser-or-node": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/browser-or-node/-/browser-or-node-1.3.0.tgz", + "integrity": "sha512-0F2z/VSnLbmEeBcUrSuDH5l0HxTXdQQzLjkmBR4cYfvg1zJrKSlmIZFqyFR8oX0NrwPhy3c3HQ6i3OxMbew4Tg==" + }, + "node_modules/isomorphic-ws": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/isomorphic-ws/-/isomorphic-ws-4.0.1.tgz", + "integrity": "sha512-BhBvN2MBpWTaSHdWRb/bwdZJ1WaehQ2L1KngkCkfLUGF0mAWAT1sQUQacEmQ0jXkFw/czDXPNQSL5u2/Krsz1w==", + "peerDependencies": { + "ws": "*" + } + }, + "node_modules/node-int64": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz", + "integrity": "sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw==" + }, + "node_modules/q": { + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/q/-/q-1.5.1.tgz", + "integrity": "sha512-kV/CThkXo6xyFEZUugw/+pIOywXcDbFYgSct5cT3gqlbkBE1SJdwy6UQoZvodiWF/ckQLZyDE/Bu1M6gVu5lVw==", + "deprecated": "You or someone you depend on is using Q, the JavaScript Promise library that gave JavaScript developers strong feelings about promises. They can almost certainly migrate to the native JavaScript promise now. Thank you literally everyone for joining me in this bet against the odds. Be excellent to each other.\n\n(For a CapTP with native promises, see @endo/eventual-send and @endo/captp)", + "engines": { + "node": ">=0.6.0", + "teleport": ">=0.2.0" + } + }, + "node_modules/thrift": { + "version": "0.20.0", + "resolved": "https://registry.npmjs.org/thrift/-/thrift-0.20.0.tgz", + "integrity": "sha512-oSmJTaoIAGolpupVHFfsWcmdEKX81fcDI6ty0hhezzdgZvp0XyXgMe9+1YusI8Ahy0HK4n8jlNrkPjOPeHZjdQ==", + "dependencies": { + "browser-or-node": "^1.2.1", + "isomorphic-ws": "^4.0.1", + "node-int64": "^0.4.0", + "q": "^1.5.0", + "ws": "^5.2.3" + }, + "engines": { + "node": ">= 10.18.0" + } + }, + "node_modules/ws": { + "version": "5.2.4", + "resolved": "https://registry.npmjs.org/ws/-/ws-5.2.4.tgz", + "integrity": "sha512-fFCejsuC8f9kOSu9FYaOw8CdO68O3h5v0lg4p74o8JqWpwTf9tniOD+nOB78aWoVSS6WptVUmDrp/KPsMVBWFQ==", + "dependencies": { + "async-limiter": "~1.0.0" + } + } + } +} diff --git a/package.json b/package.json index 21fccf3..9897b51 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,7 @@ "repository": "https://github.com/guardian/content-atom", "main": "js/main.js", "dependencies": { - "thrift": "^0.15.0" + "thrift": "^0.20.0" }, "license": "Apache-2.0", "files": [ From 08ee98873ce735188eaedaabe6456fbf454d26d7 Mon Sep 17 00:00:00 2001 From: Andy Gallagher Date: Wed, 3 Jul 2024 10:57:40 +0100 Subject: [PATCH 2/2] ok, now updated the lib version in the _right_ place --- build.sbt | 2 +- package-lock.json | 16 ++++++++++++++++ package.json | 3 +++ 3 files changed, 20 insertions(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index c4b03bd..95a34f6 100644 --- a/build.sbt +++ b/build.sbt @@ -4,7 +4,7 @@ import sbtversionpolicy.withsbtrelease.ReleaseVersion val contentEntityVersion = "3.0.3" val scroogeVersion = "22.1.0" // remember to also update plugins.sbt if the scrooge version changes -val thriftVersion = "0.15.0" // remember to also update package.json if the thrift version changes +val thriftVersion = "0.20.0" // remember to also update package.json if the thrift version changes val artifactProductionSettings = Seq( organization := "com.gu", diff --git a/package-lock.json b/package-lock.json index f81ab6e..6e22b91 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,6 +10,9 @@ "license": "Apache-2.0", "dependencies": { "thrift": "^0.20.0" + }, + "devDependencies": { + "typescript": "^4.5.4" } }, "node_modules/async-limiter": { @@ -60,6 +63,19 @@ "node": ">= 10.18.0" } }, + "node_modules/typescript": { + "version": "4.9.5", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.5.tgz", + "integrity": "sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==", + "dev": true, + "bin": { + "tsc": "bin/tsc", + "tsserver": "bin/tsserver" + }, + "engines": { + "node": ">=4.2.0" + } + }, "node_modules/ws": { "version": "5.2.4", "resolved": "https://registry.npmjs.org/ws/-/ws-5.2.4.tgz", diff --git a/package.json b/package.json index 9897b51..cb28273 100644 --- a/package.json +++ b/package.json @@ -7,6 +7,9 @@ "dependencies": { "thrift": "^0.20.0" }, + "devDependencies": { + "typescript": "^4.5.4" + }, "license": "Apache-2.0", "files": [ "js/main.js",