@redocly/cli 1.0.0-beta.130 → 1.0.0-beta.131

package/lib/__tests__/commands/build-docs.test.js

@@ -19,7 +19,6 @@ jest.mock('fs');
 jest.mock('../../utils');
 const config = {
     output: '',
-    cdn: false,
     title: 'Test',
     disableGoogleFont: false,
     templateFileName: '',
@@ -46,7 +45,6 @@ describe('build-docs', () => {
         const processExitMock = jest.spyOn(process, 'exit').mockImplementation();
         yield build_docs_1.handlerBuildCommand({
             o: '',
-            cdn: false,
             title: 'test',
             disableGoogleFont: false,
             template: '',

package/lib/commands/build-docs/index.js

@@ -25,7 +25,6 @@ const handlerBuildCommand = (argv, configFromFile) => __awaiter(void 0, void 0,
     const { path: pathToApi } = apis[0];
     const options = {
         output: argv.o,
-        cdn: argv.cdn,
         title: argv.title,
         disableGoogleFont: argv.disableGoogleFont,
         templateFileName: argv.template,

package/lib/commands/build-docs/types.d.ts

@@ -1,6 +1,5 @@
 export declare type BuildDocsOptions = {
     watch?: boolean;
-    cdn?: boolean;
     output?: string;
     title?: string;
     disableGoogleFont?: boolean;
@@ -13,7 +12,6 @@ export declare type BuildDocsOptions = {
 export declare type BuildDocsArgv = {
     api: string;
     o: string;
-    cdn: boolean;
     title?: string;
     disableGoogleFont?: boolean;
     template?: string;

package/lib/commands/build-docs/utils.d.ts

@@ -1,7 +1,7 @@
 import { Config } from '@redocly/openapi-core';
 import type { BuildDocsOptions } from './types';
 export declare function getObjectOrJSON(openapiOptions: string | Record<string, unknown>, config: Config): JSON | Record<string, unknown> | Config;
-export declare function getPageHTML(api: any, pathToApi: string, { cdn, title, disableGoogleFont, templateFileName, templateOptions, redocOptions, redocCurrentVersion, }: BuildDocsOptions): Promise<string>;
+export declare function getPageHTML(api: any, pathToApi: string, { title, disableGoogleFont, templateFileName, templateOptions, redocOptions, redocCurrentVersion, }: BuildDocsOptions): Promise<string>;
 export declare function sanitizeJSONString(str: string): string;
 export declare function escapeClosingScriptTag(str: string): string;
 export declare function escapeUnicode(str: string): string;

package/lib/commands/build-docs/utils.js

@@ -49,7 +49,7 @@ function getObjectOrJSON(openapiOptions, config) {
     return {};
 }
 exports.getObjectOrJSON = getObjectOrJSON;
-function getPageHTML(api, pathToApi, { cdn, title, disableGoogleFont, templateFileName, templateOptions, redocOptions = {}, redocCurrentVersion, }) {
+function getPageHTML(api, pathToApi, { title, disableGoogleFont, templateFileName, templateOptions, redocOptions = {}, redocCurrentVersion, }) {
     return __awaiter(this, void 0, void 0, function* () {
         process.stderr.write('Prerendering docs');
         const apiUrl = redocOptions.specUrl || (openapi_core_1.isAbsoluteUrl(pathToApi) ? pathToApi : undefined);
@@ -74,9 +74,7 @@ function getPageHTML(api, pathToApi, { cdn, title, disableGoogleFont, templateFi
       Redoc.${'hydrate(__redoc_state, container)'};
 
       </script>`,
-            redocHead: (cdn
-                ? '<script src="https://cdn.redoc.ly/redoc/latest/bundles/redoc.standalone.js"></script>'
-                : `<script src="https://cdn.redoc.ly/redoc/v${redocCurrentVersion}/bundles/redoc.standalone.js"></script>`) +
+            redocHead: `<script src="https://cdn.redoc.ly/redoc/v${redocCurrentVersion}/bundles/redoc.standalone.js"></script>` +
                 css,
             title: title || api.info.title || 'ReDoc documentation',
             disableGoogleFont,

package/lib/fetch-with-timeout.d.ts

@@ -1,2 +1,2 @@
-declare const _default: (url: string, options?: {}) => Promise<import("node-fetch").Response>;
+declare const _default: (url: string, options?: {}) => Promise<import("node-fetch").Response | undefined>;
 export default _default;

package/lib/fetch-with-timeout.js

@@ -12,14 +12,19 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const node_fetch_1 = require("node-fetch");
 const TIMEOUT = 3000;
 exports.default = (url, options = {}) => __awaiter(void 0, void 0, void 0, function* () {
-    if (!global.AbortController) {
-        return node_fetch_1.default(url, options);
+    try {
+        if (!global.AbortController) {
+            return node_fetch_1.default(url, options);
+        }
+        const controller = new AbortController();
+        const timeout = setTimeout(() => {
+            controller.abort();
+        }, TIMEOUT);
+        const res = yield node_fetch_1.default(url, Object.assign({ signal: controller.signal }, options));
+        clearTimeout(timeout);
+        return res;
+    }
+    catch (e) {
+        return;
     }
-    const controller = new AbortController();
-    const timeout = setTimeout(() => {
-        controller.abort();
-    }, TIMEOUT);
-    const res = yield node_fetch_1.default(url, Object.assign({ signal: controller.signal }, options));
-    clearTimeout(timeout);
-    return res;
 });

package/lib/index.js

@@ -397,11 +397,6 @@ yargs
         type: 'boolean',
         default: false,
     },
-    cdn: {
-        describe: 'Do not include Redoc source code into html page, use link to CDN instead',
-        type: 'boolean',
-        default: false,
-    },
     t: {
         alias: 'template',
         describe: 'Path to handlebars page template, see https://git.io/vh8fP for the example',

package/lib/update-version-notifier.js

@@ -42,6 +42,8 @@ const isNewVersionAvailable = (current, latest) => semver_1.compare(current, lat
 const getLatestVersion = (packageName) => __awaiter(void 0, void 0, void 0, function* () {
     const latestUrl = `http://registry.npmjs.org/${packageName}/latest`;
     const response = yield fetch_with_timeout_1.default(latestUrl);
+    if (!response)
+        return;
     const info = yield response.json();
     return info.version;
 });
@@ -51,8 +53,10 @@ const cacheLatestVersion = () => {
     }
     getLatestVersion(exports.name)
         .then((version) => {
-        const lastCheckFile = path_1.join(os_1.tmpdir(), VERSION_CACHE_FILE);
-        fs_1.writeFileSync(lastCheckFile, version);
+        if (version) {
+            const lastCheckFile = path_1.join(os_1.tmpdir(), VERSION_CACHE_FILE);
+            fs_1.writeFileSync(lastCheckFile, version);
+        }
     })
         .catch(() => { });
 };

package/lib/utils.js

@@ -417,7 +417,7 @@ function sendTelemetry(argv, exit_code, has_config) {
             const { _: [command], $0: _ } = argv, args = __rest(argv, ["_", "$0"]);
             const event_time = new Date().toISOString();
             const redoclyClient = new openapi_core_1.RedoclyClient();
-            const logged_in = yield redoclyClient.isAuthorizedWithRedoclyByRegion();
+            const logged_in = redoclyClient.hasTokens();
             const data = {
                 event: 'cli_command',
                 event_time,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@redocly/cli",
-  "version": "1.0.0-beta.130",
+  "version": "1.0.0-beta.131",
   "description": "",
   "license": "MIT",
   "bin": {
@@ -14,6 +14,7 @@
   "scripts": {
     "compile": "tsc",
     "copy-assets": "cp src/commands/preview-docs/preview-server/default.hbs lib/commands/preview-docs/preview-server/default.hbs && cp src/commands/preview-docs/preview-server/hot.js lib/commands/preview-docs/preview-server/hot.js && cp src/commands/preview-docs/preview-server/oauth2-redirect.html lib/commands/preview-docs/preview-server/oauth2-redirect.html && cp src/commands/build-docs/template.hbs lib/commands/build-docs/template.hbs",
+    "prepack": "npm run copy-assets",
     "prepublishOnly": "npm run copy-assets"
   },
   "repository": {
@@ -33,7 +34,7 @@
     "Roman Hotsiy <roman@redoc.ly> (https://redoc.ly/)"
   ],
   "dependencies": {
-    "@redocly/openapi-core": "1.0.0-beta.130",
+    "@redocly/openapi-core": "1.0.0-beta.131",
     "assert-node-version": "^1.0.3",
     "chokidar": "^3.5.1",
     "colorette": "^1.2.0",
@@ -44,13 +45,11 @@
     "redoc": "~2.0.0",
     "semver": "^7.5.2",
     "simple-websocket": "^9.0.0",
-    "yargs": "17.0.1"
-  },
-  "peerDependencies": {
+    "yargs": "17.0.1",
     "mobx": "^6.0.4",
-    "react": "^16.8.4 || ^17.0.0",
-    "react-dom": "^16.8.4 || ^17.0.0",
-    "styled-components": "^4.1.1 || ^5.1.1"
+    "react": "^17.0.0",
+    "react-dom": "^17.0.0",
+    "styled-components": "^5.1.1"
   },
   "devDependencies": {
     "@types/configstore": "^5.0.1",