Skip to content

Commit fd4c3b5

Browse files
author
Simon Rogers
committed
Update swagger install
1 parent e0d5863 commit fd4c3b5

File tree

4 files changed

+166
-63
lines changed

4 files changed

+166
-63
lines changed

packages/openapi/install_swagger.js renamed to packages/openapi/install_swagger.mjs

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
const fs = require('fs/promises')
2-
const fs_constants = require('fs').constants
3-
// eslint-disable-next-line n/no-unpublished-require
4-
const wget = require('wget-improved')
1+
import { mkdir, access, constants } from 'fs/promises'
2+
import { exit } from 'process'
3+
import wget from 'wget-improved'
54

65
async function get(url, path) {
76
let totalBytes = 0
@@ -23,25 +22,25 @@ async function get(url, path) {
2322
}
2423
})
2524
download.on('end', function (output) {
26-
process.stdout.write(`Downloaded 100% of '${path}'. Total length ${totalBytes} bytes.\n`)
25+
process.stdout.write(`${output}, total length ${totalBytes} bytes.\n`)
2726
resolve(output)
2827
})
2928
})
3029
}
3130

3231
async function checkInstall() {
3332
console.log('Checking/Installing swagger codegen.')
34-
await fs.mkdir('jars').catch((e) => {
33+
await mkdir('jars').catch((e) => {
3534
if (e.code === 'EEXIST') return
3635
else throw e
3736
})
3837

3938
const srcPath =
40-
'https://repo1.maven.org/maven2/io/swagger/codegen/v3/swagger-codegen-cli/3.0.34/swagger-codegen-cli-3.0.34.jar'
39+
'https://repo1.maven.org/maven2/io/swagger/codegen/v3/swagger-codegen-cli/3.0.68/swagger-codegen-cli-3.0.68.jar'
4140
const swaggerFilename = 'swagger-codegen-cli.jar'
42-
await fs
43-
.access(`jars/${swaggerFilename}`, fs_constants.R_OK)
44-
.catch(async () => get(srcPath, `jars/${swaggerFilename}`))
41+
await access(`jars/${swaggerFilename}`, constants.R_OK).catch(async () => get(srcPath, `jars/${swaggerFilename}`))
4542
}
4643

47-
checkInstall()
44+
await checkInstall()
45+
46+
exit(0)

packages/openapi/openapitools.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22
"$schema": "../node_modules/@openapitools/openapi-generator-cli/config.schema.json",
33
"spaces": 2,
44
"generator-cli": {
5-
"version": "6.2.0"
5+
"version": "7.13.0"
66
}
77
}

packages/openapi/package.json

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,14 @@
2020
"genclient:ts": "run -T rimraf client/ts && openapi-generator-cli generate -i ./api/actions.yaml -o client/ts -g typescript-fetch -p supportsES6=true",
2121
"genclient:rs": "run -T rimraf client/rs && openapi-generator-cli generate -i ./api/actions.yaml -o client/rs -g rust",
2222
"gendocs": "run -T rimraf docs && node install_swagger.js && java -jar ./jars/swagger-codegen-cli.jar generate -i ./api/actions.yaml -l html2 -o ./docs",
23-
"genserver": "run -T rimraf server && node install_swagger.js && java -jar ./jars/swagger-codegen-cli.jar generate -i ./api/actions.yaml -l nodejs-server -o server && cd server && npm install && cd ../",
23+
"genserver": "run -T rimraf server && node install_swagger.mjs && java -jar ./jars/swagger-codegen-cli.jar generate -i ./api/actions.yaml -l nodejs-server -o server && cd server && npm install && cd ../",
2424
"runserver": "run genserver && cd server && node index.js",
2525
"test": "run lint && run genclient:ts && run unit",
2626
"unit:no-server": "node --experimental-fetch ../node_modules/jest/bin/jest.js --detectOpenHandles --forceExit"
2727
},
2828
"prettier": "@sofie-automation/code-standard-preset/.prettierrc.json",
2929
"engines": {
30-
"node": ">=21"
30+
"node": ">=22.13.1"
3131
},
3232
"files": [
3333
"/api",
@@ -38,7 +38,7 @@
3838
"tslib": "^2.8.1"
3939
},
4040
"devDependencies": {
41-
"@openapitools/openapi-generator-cli": "^2.16.3",
41+
"@openapitools/openapi-generator-cli": "^2.20.2",
4242
"eslint": "^9.18.0",
4343
"eslint-plugin-yml": "^1.16.0",
4444
"js-yaml": "^4.1.0",
@@ -51,5 +51,6 @@
5151
"*.{ts,tsx,js,jsx,yaml}": [
5252
"yarn lint:raw"
5353
]
54-
}
54+
},
55+
"packageManager": "[email protected]"
5556
}

0 commit comments

Comments
 (0)