Skip to content

Commit

Permalink
Revert "feat: add deprecation label to redoc-cli (Redocly#2172)"
Browse files Browse the repository at this point in the history
This reverts commit de3aa44.
  • Loading branch information
ckoegel committed Jun 6, 2023
1 parent 9b5a241 commit 6e7d27f
Show file tree
Hide file tree
Showing 6 changed files with 1,278 additions and 59 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ Refer to the Redocly's documentation for more information on these products:
- [Simple integration with `create-react-app`](https://redocly.com/docs/redoc/quickstart/react/)

[Example repo](https://github.com/APIs-guru/create-react-app-redoc)
- [Command-line interface to bundle your docs into a **zero-dependency** HTML file](https://redocly.com/docs/cli/commands/build-docs/)
- [Command-line interface to bundle your docs into a **zero-dependency** HTML file](https://redoc.ly/docs/redoc/quickstart/cli/)
- Neat **interactive** documentation for nested objects <br>
![](docs/images/nested-demo.gif)

Expand Down
2 changes: 0 additions & 2 deletions cli/README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
# redoc-cli

**DEPRECATED: this package is deprecated. Use `npx @redocly/cli build-docs <api>` instead.**

**[ReDoc](https://github.com/Redocly/redoc)'s Command Line Interface**

## Installation
Expand Down
58 changes: 27 additions & 31 deletions cli/index.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#!/usr/bin/env node
/* tslint:disable:no-implicit-dependencies */
import { createElement } from 'react';
import * as React from 'react';
import * as updateNotifier from 'update-notifier';
import { renderToString } from 'react-dom/server';
import { ServerStyleSheet } from 'styled-components';

Expand All @@ -9,7 +10,6 @@ import { createServer, IncomingMessage, ServerResponse } from 'http';
import { dirname, join, resolve, extname as getExtName } from 'path';

import * as zlib from 'zlib';
import * as boxen from 'boxen';

// @ts-ignore
import { createStore, loadAndBundleSpec, Redoc } from 'redoc';
Expand Down Expand Up @@ -66,14 +66,6 @@ export const mimeTypes = {

const BUNDLES_DIR = dirname(require.resolve('redoc'));

const boxenOptions = {
title: 'DEPRECATED',
titleAlignment: 'center',
padding: 1,
margin: 1,
borderColor: 'red',
} as boxen.Options;

const builderForBuildCommand = yargs => {
yargs.positional('spec', {
describe: 'path or URL to your spec',
Expand Down Expand Up @@ -120,6 +112,7 @@ const handlerForBuildCommand = async (argv: any) => {
};

try {
notifyUpdateCliVersion();
await bundle(argv.spec, config);
} catch (e) {
handleError(e);
Expand All @@ -128,7 +121,7 @@ const handlerForBuildCommand = async (argv: any) => {

YargsParser.command(
'serve <spec>',
'start the server [deprecated]',
'start the server',
yargs => {
yargs.positional('spec', {
describe: 'path or URL to your spec',
Expand Down Expand Up @@ -183,38 +176,38 @@ YargsParser.command(
};

try {
notifyUpdateCliVersion();
await serve(argv.host as string, argv.port as number, argv.spec as string, config);
} catch (e) {
handleError(e);
}
},
[
res => {
console.log(`
${boxen(
'This package is deprecated.\n\nUse `npx @redocly/cli preview-docs <api>` instead.',
boxenOptions,
)}`);
console.log(
`\n⚠️ This command is deprecated. Use "npx @redocly/cli preview-docs petstore.yaml"\n`,
);
return res;
},
],
true,
)
.command(
'build <spec>',
'build definition into zero-dependency HTML-file [deprecated]',
'build definition into zero-dependency HTML-file',
builderForBuildCommand,
handlerForBuildCommand,
[notifyDeprecation],
true,
)
.command(
'bundle <spec>',
'bundle spec into zero-dependency HTML-file [deprecated]',
builderForBuildCommand,
handlerForBuildCommand,
[notifyDeprecation],
true,
[
res => {
console.log(`\n⚠️ This command is deprecated. Use "build" command instead.\n`);
return res;
},
],
)
.demandCommand()
.options('t', {
Expand Down Expand Up @@ -351,7 +344,7 @@ async function getPageHTML(
const store = await createStore(spec, specUrl, redocOptions);
const sheet = new ServerStyleSheet();
// @ts-ignore
html = renderToString(sheet.collectStyles(createElement(Redoc, { store })));
html = renderToString(sheet.collectStyles(React.createElement(Redoc, { store })));
css = sheet.getStyleTags();
state = await store.toJS();

Expand Down Expand Up @@ -479,12 +472,15 @@ function getObjectOrJSON(options) {
}
}

function notifyDeprecation(res: YargsParser.Arguments): YargsParser.Arguments {
console.log(
boxen(
'This package is deprecated.\n\nUse `npx @redocly/cli build-docs <api>` instead.',
boxenOptions,
),
);
return res;
function notifyUpdateCliVersion() {
const pkg = require('./package.json');
const notifier = updateNotifier({
pkg,
updateCheckInterval: 0,
shouldNotifyInNpmScript: true,
});
notifier.notify({
message:
'Run `{updateCommand}` to update.\nChangelog: https://github.com/Redocly/redoc/releases/tag/{latestVersion}',
});
}
Loading

0 comments on commit 6e7d27f

Please sign in to comment.