Skip to content
This repository has been archived by the owner on Nov 28, 2022. It is now read-only.

Commit

Permalink
chore: update beta/editor-rebase with latest master (#435)
Browse files Browse the repository at this point in the history
* fix: Fixing a regression of additionalProperties keys not being editable (#404)

* fix: fixing a regression of additionalProperties keys not being editable

* chore: refactoring and simplifying the label logic

* chore: updating dist files

* v4.13.3

* chore: Bump css-loader from 3.2.1 to 3.3.2 (#405)

Bumps [css-loader](https://github.com/webpack-contrib/css-loader) from 3.2.1 to 3.3.2.
- [Release notes](https://github.com/webpack-contrib/css-loader/releases)
- [Changelog](https://github.com/webpack-contrib/css-loader/blob/master/CHANGELOG.md)
- [Commits](webpack-contrib/css-loader@v3.2.1...v3.3.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* chore: Bump @readme/eslint-config from 1.7.0 to 1.8.0 (#406)

* chore: Bump @readme/eslint-config from 1.7.0 to 1.8.0

Bumps [@readme/eslint-config](https://github.com/readmeio/eslint-config) from 1.7.0 to 1.8.0.
- [Release notes](https://github.com/readmeio/eslint-config/releases)
- [Changelog](https://github.com/readmeio/eslint-config/blob/master/CHANGELOG.md)
- [Commits](https://github.com/readmeio/eslint-config/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* style: resolving style issues with test formatting

* style: resolving style issues with test formatting

* style: resolving style issues with test formatting

* refactor: refer to new pointers for log (#407)

* ♻️ refer to new pointers for log

* ✅ fix the tests

* 🚨 prettier

* chore: dist updates

* v4.14.0

* chore: Bump @babel/preset-env from 7.7.6 to 7.7.7 (#413)

Bumps [@babel/preset-env](https://github.com/babel/babel) from 7.7.6 to 7.7.7.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md)
- [Commits](babel/babel@v7.7.6...v7.7.7)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* chore(deps-dev): Bump @readme/eslint-config from 1.8.0 to 1.8.1 (#416)

Bumps [@readme/eslint-config](https://github.com/readmeio/eslint-config) from 1.8.0 to 1.8.1.
- [Release notes](https://github.com/readmeio/eslint-config/releases)
- [Changelog](https://github.com/readmeio/eslint-config/blob/master/CHANGELOG.md)
- [Commits](https://github.com/readmeio/eslint-config/commits/1.8.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* chore(deps-dev): Bump eslint from 6.7.2 to 6.8.0 (#410)

Bumps [eslint](https://github.com/eslint/eslint) from 6.7.2 to 6.8.0.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/master/CHANGELOG.md)
- [Commits](eslint/eslint@v6.7.2...v6.8.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* chore(deps): Bump oas from 1.0.2 to 1.1.0 (#415)

Bumps [oas](https://github.com/readmeio/oas) from 1.0.2 to 1.1.0.
- [Release notes](https://github.com/readmeio/oas/releases)
- [Changelog](https://github.com/readmeio/oas/blob/master/CHANGELOG.md)
- [Commits](https://github.com/readmeio/oas/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* chore(deps-dev): Bump enzyme from 3.10.0 to 3.11.0 (#408)

Bumps [enzyme](https://github.com/airbnb/enzyme/tree/HEAD/packages/enzyme) from 3.10.0 to 3.11.0.
- [Release notes](https://github.com/airbnb/enzyme/releases)
- [Changelog](https://github.com/airbnb/enzyme/blob/master/CHANGELOG.md)
- [Commits](https://github.com/airbnb/enzyme/commits/enzyme@3.11.0/packages/enzyme)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* chore(deps-dev): Bump webpack from 4.41.2 to 4.41.4 (#409)

Bumps [webpack](https://github.com/webpack/webpack) from 4.41.2 to 4.41.4.
- [Release notes](https://github.com/webpack/webpack/releases)
- [Commits](webpack/webpack@v4.41.2...v4.41.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* chore(deps-dev): Bump enzyme-adapter-react-16 from 1.15.1 to 1.15.2 (#417)

Bumps [enzyme-adapter-react-16](https://github.com/airbnb/enzyme/tree/HEAD/packages/enzyme-adapter-react-16) from 1.15.1 to 1.15.2.
- [Release notes](https://github.com/airbnb/enzyme/releases)
- [Changelog](https://github.com/airbnb/enzyme/blob/master/CHANGELOG.md)
- [Commits](https://github.com/airbnb/enzyme/commits/enzyme-adapter-react-16@1.15.2/packages/enzyme-adapter-react-16)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* chore(deps): Bump css-loader from 3.3.2 to 3.4.0 (#411)

Bumps [css-loader](https://github.com/webpack-contrib/css-loader) from 3.3.2 to 3.4.0.
- [Release notes](https://github.com/webpack-contrib/css-loader/releases)
- [Changelog](https://github.com/webpack-contrib/css-loader/blob/master/CHANGELOG.md)
- [Commits](webpack-contrib/css-loader@v3.3.2...v3.4.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* chore(deps): Bump codemirror from 5.49.2 to 5.50.0 (#412)

Bumps [codemirror](https://github.com/codemirror/CodeMirror) from 5.49.2 to 5.50.0.
- [Release notes](https://github.com/codemirror/CodeMirror/releases)
- [Changelog](https://github.com/codemirror/CodeMirror/blob/master/CHANGELOG.md)
- [Commits](codemirror/codemirror5@5.49.2...5.50.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* chore(deps-dev): Bump style-loader from 1.0.1 to 1.1.1 (#414)

Bumps [style-loader](https://github.com/webpack-contrib/style-loader) from 1.0.1 to 1.1.1.
- [Release notes](https://github.com/webpack-contrib/style-loader/releases)
- [Changelog](https://github.com/webpack-contrib/style-loader/blob/master/CHANGELOG.md)
- [Commits](webpack-contrib/style-loader@v1.0.1...v1.1.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* chore(deps-dev): Bump @readme/eslint-config from 1.8.1 to 1.9.0 (#424)

Bumps [@readme/eslint-config](https://github.com/readmeio/eslint-config) from 1.8.1 to 1.9.0.
- [Release notes](https://github.com/readmeio/eslint-config/releases)
- [Changelog](https://github.com/readmeio/eslint-config/blob/master/CHANGELOG.md)
- [Commits](readmeio/standards@1.8.1...1.9.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* chore(deps-dev): Bump lerna from 3.19.0 to 3.20.2 (#428)

Bumps [lerna](https://github.com/lerna/lerna/tree/HEAD/core/lerna) from 3.19.0 to 3.20.2.
- [Release notes](https://github.com/lerna/lerna/releases)
- [Changelog](https://github.com/lerna/lerna/blob/master/core/lerna/CHANGELOG.md)
- [Commits](https://github.com/lerna/lerna/commits/v3.20.2/core/lerna)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* chore(deps-dev): Bump nock from 11.7.0 to 11.7.1 (#425)

Bumps [nock](https://github.com/nock/nock) from 11.7.0 to 11.7.1.
- [Release notes](https://github.com/nock/nock/releases)
- [Changelog](https://github.com/nock/nock/blob/master/CHANGELOG.md)
- [Commits](nock/nock@v11.7.0...v11.7.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* chore(deps): [Security] Bump handlebars from 4.1.2 to 4.5.3 (#418)

Bumps [handlebars](https://github.com/wycats/handlebars.js) from 4.1.2 to 4.5.3. **This update includes a security fix.**
- [Release notes](https://github.com/wycats/handlebars.js/releases)
- [Changelog](https://github.com/wycats/handlebars.js/blob/master/release-notes.md)
- [Commits](handlebars-lang/handlebars.js@v4.1.2...v4.5.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* chore(deps-dev): Bump style-loader from 1.1.1 to 1.1.2 (#419)

Bumps [style-loader](https://github.com/webpack-contrib/style-loader) from 1.1.1 to 1.1.2.
- [Release notes](https://github.com/webpack-contrib/style-loader/releases)
- [Changelog](https://github.com/webpack-contrib/style-loader/blob/master/CHANGELOG.md)
- [Commits](webpack-contrib/style-loader@v1.1.1...v1.1.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* chore(deps-dev): Bump webpack-dev-server from 3.9.0 to 3.10.1 (#421)

Bumps [webpack-dev-server](https://github.com/webpack/webpack-dev-server) from 3.9.0 to 3.10.1.
- [Release notes](https://github.com/webpack/webpack-dev-server/releases)
- [Changelog](https://github.com/webpack/webpack-dev-server/blob/v3.10.1/CHANGELOG.md)
- [Commits](webpack/webpack-dev-server@v3.9.0...v3.10.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* chore(deps-dev): Bump @babel/core from 7.7.5 to 7.7.7 (#422)

Bumps [@babel/core](https://github.com/babel/babel) from 7.7.5 to 7.7.7.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md)
- [Commits](babel/babel@v7.7.5...v7.7.7)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* chore(deps-dev): Bump webpack from 4.41.4 to 4.41.5 (#423)

Bumps [webpack](https://github.com/webpack/webpack) from 4.41.4 to 4.41.5.
- [Release notes](https://github.com/webpack/webpack/releases)
- [Commits](webpack/webpack@v4.41.4...v4.41.5)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* chore(deps-dev): Bump css-loader from 3.4.0 to 3.4.1 (#426)

Bumps [css-loader](https://github.com/webpack-contrib/css-loader) from 3.4.0 to 3.4.1.
- [Release notes](https://github.com/webpack-contrib/css-loader/releases)
- [Changelog](https://github.com/webpack-contrib/css-loader/blob/master/CHANGELOG.md)
- [Commits](webpack-contrib/css-loader@v3.4.0...v3.4.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* chore(deps): Bump codemirror from 5.50.0 to 5.50.2 (#427)

Bumps [codemirror](https://github.com/codemirror/CodeMirror) from 5.50.0 to 5.50.2.
- [Release notes](https://github.com/codemirror/CodeMirror/releases)
- [Changelog](https://github.com/codemirror/CodeMirror/blob/master/CHANGELOG.md)
- [Commits](codemirror/codemirror5@5.50.0...5.50.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* test: updating an out of date fixture that was breaking the local demo (#429)

* chore(dev-deps): replacing uglifyjs-webpack-plugin with terser-webpack-plugin (#430)

* test: removing codeclimate from our builds (#432)

* fix: align params to top (#431)

* chore: dist updates

* v4.15.0

* test: setting up a github workflow for running unit tests (#434)

* test: setting up a github workflow for running unit tests

* docs: updating readmes with a github workflow ci badge

* fix: resolving some eslint callouts

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Co-authored-by: Sean <dokko1230@gmail.com>
Co-authored-by: Rafe Goldberg <rafegoldberg@gmail.com>
  • Loading branch information
4 people committed Jan 23, 2020
1 parent bf668a9 commit b2ebf64
Show file tree
Hide file tree
Showing 10 changed files with 52 additions and 10 deletions.
2 changes: 1 addition & 1 deletion .babelrc
Expand Up @@ -5,7 +5,7 @@
"browsers": ["last 2 versions"]
}
}],
"@babel/react"
"@babel/preset-react"
],
"plugins": ["@babel/plugin-proposal-class-properties"]
}
9 changes: 7 additions & 2 deletions packages/markdown/README.md
@@ -1,12 +1,17 @@
<img align=right width=26% src=http://owlbert.io/images/owlberts-png/Reading.psd.png>

@ReadMe Markdown
@readme/markdown
===

[![Build](https://github.com/readmeio/api-explorer/workflows/CI/badge.svg)](https://github.com/readmeio/api-explorer/tree/master/packages/markdown)

[![](https://d3vv6lp55qjaqc.cloudfront.net/items/1M3C3j0I0s0j3T362344/Untitled-2.png)](https://readme.io)

## Installation

[![Build](https://github.com/readmeio/api-explorer/workflows/CI/badge.svg)](https://github.com/readmeio/api-explorer/tree/master/packages/markdown)


## Installation

```
Expand Down Expand Up @@ -89,7 +94,7 @@ Most of our magic blocks render neatly to pure markdown representations. In some
Callouts are very similar to blockquotes in both display and syntax. They are defined by a title with an initial emoji, which determines the callout's theme:

> ❗️ Watch Out
>
>
> This is a callout using the error theme.

There are five potential themes:
Expand Down
3 changes: 2 additions & 1 deletion packages/markdown/__tests__/flavored-compilers.test.js
Expand Up @@ -50,6 +50,7 @@ describe('ReadMe-Flavored Markdown Compilers', () => {
const out = compile(ast);
expect(out).toMatchSnapshot();
});

it('Callouts', () => {
const txt = `[block:callout]
{
Expand All @@ -58,7 +59,7 @@ describe('ReadMe-Flavored Markdown Compilers', () => {
"body": "Vitae reprehenderit at aliquid error voluptates eum dignissimos."
}
[/block]
And this is a paragraph!
`;
const ast = parse(txt);
Expand Down
4 changes: 3 additions & 1 deletion packages/markdown/__tests__/flavored-parsers.test.js
Expand Up @@ -19,16 +19,18 @@ const process = (text, opts = options) =>
describe('Parse ReadMe-Flavored Markdown Syntax', () => {
it('Callouts', () => {
const text = `> ℹ️ Info Callout
>
>
> Lorem ipsum dolor sit amet consectetur adipisicing elit.`;
expect(process(text)).toMatchSnapshot();
});

it('Multi-Block', () => {
const text =
"\n\n```javascript multiple.js\nconsole.log('a multi-file code block');\n```\n```javascript\nconsole.log('an unnamed sample snippet');\n```\n\n&nbsp;";
const ast = process(text);
expect(ast).toMatchSnapshot();
});

it('Single Block', () => {
const text =
"\n\n```javascript multiple.js\nconsole.log('a multi-file code block');\n```\n\n&nbsp;";
Expand Down
5 changes: 5 additions & 0 deletions packages/markdown/__tests__/index.test.js
Expand Up @@ -233,18 +233,23 @@ describe('export multiple Markdown renderers', () => {
},
],
};

it('renders plain markdown as React', () => {
expect(markdown.plain(text, settings)).toMatchSnapshot();
});

it('renders custom React components', () => {
expect(markdown.react(text, settings)).toMatchSnapshot();
});

it('renders AST', () => {
expect(markdown.ast(text, settings)).toMatchSnapshot();
});

it('renders MD', () => {
expect(markdown.md(tree, settings)).toMatchSnapshot();
});

it('renders HTML', () => {
expect(markdown.html(text, settings)).toMatchSnapshot();
});
Expand Down
6 changes: 6 additions & 0 deletions packages/markdown/__tests__/magic-block-parser.test.js
Expand Up @@ -30,6 +30,7 @@ describe('Parse Magic Blocks', () => {
[/block]`;
expect(process(text)).toMatchSnapshot();
});

it('Image Blocks', () => {
const text = `[block:image]
{
Expand All @@ -51,6 +52,7 @@ describe('Parse Magic Blocks', () => {
[/block]`;
expect(process(text)).toMatchSnapshot();
});

it('Code Blocks', () => {
const text = `[block:code]
{
Expand All @@ -69,6 +71,7 @@ describe('Parse Magic Blocks', () => {
[/block]`;
expect(process(text)).toMatchSnapshot();
});

it('Table Blocks', () => {
const text = `[block:parameters]
{
Expand All @@ -92,6 +95,7 @@ describe('Parse Magic Blocks', () => {
[/block]`;
expect(process(text)).toMatchSnapshot();
});

it('Embed Blocks', () => {
const text = `[block:embed]
{
Expand All @@ -104,6 +108,7 @@ describe('Parse Magic Blocks', () => {
[/block]`;
expect(process(text)).toMatchSnapshot();
});

it('Callout Blocks', () => {
const text = `[block:callout]
{
Expand All @@ -114,6 +119,7 @@ describe('Parse Magic Blocks', () => {
[/block]`;
expect(process(text)).toMatchSnapshot();
});

it('Unrecognized Blocks', () => {
const text = `[block:unrecognized]
{
Expand Down
9 changes: 8 additions & 1 deletion packages/markdown/components/Callout/index.jsx
@@ -1,4 +1,11 @@
require('./style.scss');
// There's a bug in jsdom where Jest spits out heaps of errors from it not being able to interpret
// this file, so let's not include this when running tests since we aren't doing visual testing
// anyways.
// https://github.com/jsdom/jsdom/issues/217
if (process.env.NODE_ENV !== 'test') {
// eslint-disable-next-line global-require
require('./style.scss');
}

const React = require('react');
const PropTypes = require('prop-types');
Expand Down
9 changes: 8 additions & 1 deletion packages/markdown/components/CodeTabs/index.jsx
@@ -1,4 +1,11 @@
require('./style.scss');
// There's a bug in jsdom where Jest spits out heaps of errors from it not being able to interpret
// this file, so let's not include this when running tests since we aren't doing visual testing
// anyways.
// https://github.com/jsdom/jsdom/issues/217
if (process.env.NODE_ENV !== 'test') {
// eslint-disable-next-line global-require
require('./style.scss');
}

const React = require('react');
const PropTypes = require('prop-types');
Expand Down
13 changes: 11 additions & 2 deletions packages/markdown/components/Heading/index.jsx
@@ -1,15 +1,24 @@
require('./style.scss');
// There's a bug in jsdom where Jest spits out heaps of errors from it not being able to interpret
// this file, so let's not include this when running tests since we aren't doing visual testing
// anyways.
// https://github.com/jsdom/jsdom/issues/217
if (process.env.NODE_ENV !== 'test') {
// eslint-disable-next-line global-require
require('./style.scss');
}

const React = require('react');
const PropTypes = require('prop-types');

let count = {};

document.addEventListener('DOMContentLoaded', () => {
if ('$' in window)
if ('$' in window) {
// eslint-disable-next-line no-undef
$(document).on('pjax:start', () => {
count = {};
});
}
});

function generateHeadingId(e) {
Expand Down
2 changes: 1 addition & 1 deletion packages/markdown/package.json
Expand Up @@ -25,7 +25,7 @@
"scripts": {
"build": "webpack --config webpack.config.js",
"watch": "webpack -w --progress",
"lint": "eslint -f unix . --ext .jsx --ext .js",
"lint": "eslint . --ext .jsx --ext .js",
"inspect": "jsinspect",
"pretest": "npm run lint && npm run inspect && npm run prettier",
"prettier": "prettier --list-different --write \"./**/**.{js,jsx}\"",
Expand Down

0 comments on commit b2ebf64

Please sign in to comment.