From c6e736494cf1417ba01ef961a16526f518b325c9 Mon Sep 17 00:00:00 2001
From: James Eddy <james.a.eddy@gmail.com>
Date: Tue, 24 Mar 2020 22:33:40 -0700
Subject: [PATCH 1/2] replace swagger-repo with openapi-cli; remove alias
 scripts

---
 package.json | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/package.json b/package.json
index c3ed6d3..e3963ba 100644
--- a/package.json
+++ b/package.json
@@ -16,7 +16,7 @@
     "redoc-cli": "^0.9.6",
     "remote-origin-url": "^2.0.0",
     "shelljs": "^0.7.0",
-    "swagger-repo": "2.0.0-rc.15",
+    "@redocly/openapi-cli": "0.8.4",
     "swagger-ui-dist": "3.24.0",
     "update-notifier": "3.0.1",
     "yargs-parser": "15.0.0"
@@ -24,8 +24,6 @@
   "bin": "./dist/gh-openapi-docs.js",
   "scripts": {
     "fetch": "node src/fetchpages.js",
-    "swagger": "swagger-repo",
-    "redoc": "redoc-cli",
     "build:swagger": "node src/swagger-ui.js",
     "build:redoc": "node src/redoc-ui.js",
     "clean": "rm -rf dist/* bin/*",

From 7c1e26781e91ba2d407c0d2fd656a75610ecac4e Mon Sep 17 00:00:00 2001
From: James Eddy <james.a.eddy@gmail.com>
Date: Tue, 24 Mar 2020 22:34:32 -0700
Subject: [PATCH 2/2] remove 'run npm' from exec calls and fix cli syntax

---
 src/lib/bundle.js   | 4 ++--
 src/lib/redoc-ui.js | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/lib/bundle.js b/src/lib/bundle.js
index ae7edb5..855e833 100644
--- a/src/lib/bundle.js
+++ b/src/lib/bundle.js
@@ -34,10 +34,10 @@ const bundleSpec = async () => {
         'text': OPENAPI_JSON_PATH
     });
     shell.exec(
-        `npm run swagger bundle --        -b ${specDir} -o ${OPENAPI_JSON_PATH}`
+        `openapi bundle -f --output ${OPENAPI_JSON_PATH} ${config.apiSpecPath}`
     );
     shell.exec(
-        `npm run swagger bundle -- --yaml -b ${specDir} -o ${OPENAPI_YAML_PATH}`
+        `openapi bundle -f --output ${OPENAPI_YAML_PATH} ${config.apiSpecPath}`
     );
     shell.rm('-rf', specDir);
 };
diff --git a/src/lib/redoc-ui.js b/src/lib/redoc-ui.js
index f4eb308..36c66b2 100644
--- a/src/lib/redoc-ui.js
+++ b/src/lib/redoc-ui.js
@@ -14,7 +14,7 @@ const setupUI = () => {
     var indexPath = path.join(uiPath, 'index.html');
     log.log(`Generating OpenAPI docs index at '${indexPath}'`);
     shell.exec(
-        `npm run redoc bundle -- ${OPENAPI_YAML_PATH} --output ${indexPath}`
+        `redoc-cli bundle --output ${indexPath} ${OPENAPI_YAML_PATH}`
     );
     log.preview({
         'title': 'OpenAPI docs folder contents',