Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin' into lex111/npm-flag-init-command
Browse files Browse the repository at this point in the history
  • Loading branch information
@lex111
lex111 committed Nov 12, 2020
2 parents c099139 + 6cccbf5 commit 8e8861e
Show file tree
Hide file tree
Showing 21 changed files with 1,335 additions and 600 deletions.
10 changes: 5 additions & 5 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,11 +55,11 @@
"netlify:deployPreview:v1-migrated:build": "yarn workspace docusaurus-1-website-migrated build --out-dir=../website/netlifyDeployPreview/v1-migrated"
},
"devDependencies": {
"@babel/cli": "^7.9.0",
"@babel/core": "^7.9.0",
"@babel/plugin-proposal-nullish-coalescing-operator": "^7.8.3",
"@babel/plugin-proposal-optional-chaining": "^7.9.0",
"@babel/preset-typescript": "^7.9.0",
"@babel/cli": "^7.12.1",
"@babel/core": "^7.12.3",
"@babel/plugin-proposal-nullish-coalescing-operator": "^7.12.1",
"@babel/plugin-proposal-optional-chaining": "^7.12.1",
"@babel/preset-typescript": "^7.12.1",
"@types/express": "^4.17.2",
"@types/fs-extra": "^8.0.1",
"@types/inquirer": "^6.5.0",
Expand Down
28 changes: 14 additions & 14 deletions packages/docusaurus-1.x/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,15 +27,15 @@
"docusaurus-rename-version": "./lib/rename-version.js"
},
"dependencies": {
"@babel/core": "^7.9.0",
"@babel/plugin-proposal-class-properties": "^7.8.3",
"@babel/plugin-proposal-object-rest-spread": "^7.9.0",
"@babel/polyfill": "^7.8.7",
"@babel/preset-env": "^7.9.0",
"@babel/preset-react": "^7.9.4",
"@babel/register": "^7.9.0",
"@babel/traverse": "^7.9.0",
"@babel/types": "^7.9.0",
"@babel/core": "^7.12.3",
"@babel/plugin-proposal-class-properties": "^7.12.1",
"@babel/plugin-proposal-object-rest-spread": "^7.12.1",
"@babel/polyfill": "^7.12.1",
"@babel/preset-env": "^7.12.1",
"@babel/preset-react": "^7.12.5",
"@babel/register": "^7.12.1",
"@babel/traverse": "^7.12.5",
"@babel/types": "^7.12.6",
"autoprefixer": "^9.7.5",
"babylon": "^6.18.0",
"chalk": "^3.0.0",
Expand All @@ -45,23 +45,23 @@
"cssnano": "^4.1.10",
"escape-string-regexp": "^2.0.0",
"express": "^4.17.1",
"feed": "^4.0.0",
"feed": "^4.2.1",
"fs-extra": "^8.1.0",
"gaze": "^1.1.3",
"github-slugger": "^1.2.1",
"github-slugger": "^1.3.0",
"glob": "^7.1.6",
"highlight.js": "^9.16.2",
"imagemin": "^6.0.0",
"imagemin-gifsicle": "^6.0.1",
"imagemin-jpegtran": "^6.0.0",
"imagemin-optipng": "^6.0.0",
"imagemin-svgo": "^7.0.0",
"lodash": "^4.17.15",
"lodash": "^4.17.20",
"markdown-toc": "^1.2.0",
"mkdirp": "^0.5.1",
"portfinder": "^1.0.25",
"portfinder": "^1.0.28",
"postcss": "^7.0.23",
"prismjs": "^1.17.1",
"prismjs": "^1.22.0",
"react": "^16.8.4",
"react-dev-utils": "^9.1.0",
"react-dom": "^16.8.4",
Expand Down
2 changes: 1 addition & 1 deletion packages/docusaurus-init/templates/classic/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"dependencies": {
"@docusaurus/core": "2.0.0-alpha.66",
"@docusaurus/preset-classic": "2.0.0-alpha.66",
"@mdx-js/react": "^1.5.8",
"@mdx-js/react": "^1.6.21",
"clsx": "^1.1.1",
"react": "^16.8.4",
"react-dom": "^16.8.4"
Expand Down
2 changes: 1 addition & 1 deletion packages/docusaurus-init/templates/facebook/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"dependencies": {
"@docusaurus/core": "2.0.0-alpha.66",
"@docusaurus/preset-classic": "2.0.0-alpha.66",
"@mdx-js/react": "^1.5.8",
"@mdx-js/react": "^1.6.21",
"clsx": "^1.1.1",
"react": "^16.8.4",
"react-dom": "^16.8.4"
Expand Down
18 changes: 9 additions & 9 deletions packages/docusaurus-mdx-loader/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,33 +16,33 @@
},
"license": "MIT",
"dependencies": {
"@babel/parser": "^7.9.4",
"@babel/traverse": "^7.9.0",
"@babel/parser": "^7.12.5",
"@babel/traverse": "^7.12.5",
"@docusaurus/core": "2.0.0-alpha.66",
"@docusaurus/utils": "2.0.0-alpha.66",
"@mdx-js/mdx": "^1.5.8",
"@mdx-js/react": "^1.5.8",
"@mdx-js/mdx": "^1.6.21",
"@mdx-js/react": "^1.6.21",
"escape-html": "^1.0.3",
"file-loader": "^6.0.0",
"file-loader": "^6.2.0",
"fs-extra": "^8.1.0",
"github-slugger": "^1.3.0",
"gray-matter": "^4.0.2",
"loader-utils": "^1.2.3",
"loader-utils": "^2.0.0",
"mdast-util-to-string": "^1.1.0",
"remark-emoji": "^2.1.0",
"stringify-object": "^3.3.0",
"unist-util-visit": "^2.0.2",
"url-loader": "^4.1.0"
"url-loader": "^4.1.1"
},
"devDependencies": {
"@docusaurus/types": "2.0.0-alpha.66",
"remark": "^12.0.0",
"remark-mdx": "^1.5.8",
"remark-mdx": "^1.6.21",
"to-vfile": "^6.0.0",
"unist-builder": "^2.0.3",
"unist-util-remove-position": "^2.0.1"
},
"peerDependencies": {
"peerDependencies": {
"react": "^16.13.1",
"react-dom": "^16.8.4",
"webpack": "^4.0.0 || ^5.0.0"
Expand Down
6 changes: 3 additions & 3 deletions packages/docusaurus-migrate/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,15 +30,15 @@
"fs-extra": "^9.0.1",
"glob": "^7.1.6",
"hast-util-to-string": "^1.0.4",
"hast-util-to-text": "^2.0.0",
"hast-util-to-text": "^2.0.1",
"html-tags": "^3.1.0",
"import-fresh": "^3.2.1",
"import-fresh": "^3.2.2",
"jscodeshift": "^0.10.0",
"rehype-parse": "^7.0.1",
"remark-parse": "^8.0.2",
"remark-stringify": "^8.1.0",
"semver": "^7.3.2",
"unified": "^9.0.0",
"unified": "^9.2.0",
"unist-util-visit": "^2.0.2"
},
"devDependencies": {
Expand Down
6 changes: 3 additions & 3 deletions packages/docusaurus-plugin-client-redirects/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,12 @@
"@docusaurus/types": "2.0.0-alpha.66",
"@docusaurus/utils": "2.0.0-alpha.66",
"@docusaurus/utils-validation": "2.0.0-alpha.66",
"joi": "^17.2.1",
"chalk": "^3.0.0",
"eta": "^1.1.1",
"eta": "^1.11.0",
"fs-extra": "^8.1.0",
"globby": "^10.0.1",
"lodash": "^4.17.15"
"joi": "^17.2.1",
"lodash": "^4.17.20"
},
"peerDependencies": {
"react": "^16.8.4",
Expand Down
6 changes: 3 additions & 3 deletions packages/docusaurus-plugin-content-blog/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,13 @@
"@docusaurus/types": "2.0.0-alpha.66",
"@docusaurus/utils": "2.0.0-alpha.66",
"@docusaurus/utils-validation": "2.0.0-alpha.66",
"joi": "^17.2.1",
"chalk": "^3.0.0",
"feed": "^4.1.0",
"feed": "^4.2.1",
"fs-extra": "^8.1.0",
"globby": "^10.0.1",
"joi": "^17.2.1",
"loader-utils": "^1.2.3",
"lodash": "^4.5.2",
"lodash": "^4.17.20",
"reading-time": "^1.2.0",
"remark-admonitions": "^1.2.1",
"webpack": "^4.44.1"
Expand Down
4 changes: 2 additions & 2 deletions packages/docusaurus-plugin-content-docs/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,12 @@
"@docusaurus/types": "2.0.0-alpha.66",
"@docusaurus/utils": "2.0.0-alpha.66",
"@docusaurus/utils-validation": "2.0.0-alpha.66",
"joi": "^17.2.1",
"chalk": "^3.0.0",
"execa": "^3.4.0",
"fs-extra": "^8.1.0",
"globby": "^10.0.1",
"import-fresh": "^3.2.1",
"import-fresh": "^3.2.2",
"joi": "^17.2.1",
"loader-utils": "^1.2.3",
"lodash": "^4.17.19",
"lodash.flatmap": "^4.5.0",
Expand Down
10 changes: 5 additions & 5 deletions packages/docusaurus-plugin-pwa/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,14 @@
},
"license": "MIT",
"dependencies": {
"@babel/plugin-proposal-nullish-coalescing-operator": "^7.10.1",
"@babel/plugin-proposal-optional-chaining": "^7.10.3",
"@babel/preset-env": "^7.9.0",
"@babel/plugin-proposal-nullish-coalescing-operator": "^7.12.1",
"@babel/plugin-proposal-optional-chaining": "^7.12.1",
"@babel/preset-env": "^7.12.1",
"@docusaurus/core": "2.0.0-alpha.66",
"joi": "^17.2.1",
"babel-loader": "^8.1.0",
"babel-loader": "^8.2.1",
"clsx": "^1.1.1",
"core-js": "^2.6.5",
"joi": "^17.2.1",
"terser-webpack-plugin": "^4.1.0",
"webpack": "^4.44.1",
"webpack-merge": "^4.2.2",
Expand Down
2 changes: 1 addition & 1 deletion packages/docusaurus-remark-plugin-npm2yarn/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
},
"devDependencies": {
"remark": "^12.0.0",
"remark-mdx": "^1.5.8",
"remark-mdx": "^1.6.21",
"to-vfile": "^6.0.0"
},
"peerDependencies": {
Expand Down
4 changes: 2 additions & 2 deletions packages/docusaurus-theme-bootstrap/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@
"@docusaurus/plugin-content-docs": "2.0.0-alpha.66",
"@docusaurus/plugin-content-pages": "2.0.0-alpha.66",
"@docusaurus/types": "2.0.0-alpha.66",
"@mdx-js/react": "^1.5.8",
"@mdx-js/react": "^1.6.21",
"bootstrap": "^4.4.1",
"classnames": "^2.2.6",
"clsx": "^1.1.1",
"prism-react-renderer": "^1.1.0",
"prism-react-renderer": "^1.1.1",
"reactstrap": "^8.4.1"
},
"devDependencies": {
Expand Down
12 changes: 6 additions & 6 deletions packages/docusaurus-theme-classic/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,17 +26,17 @@
"@docusaurus/plugin-content-pages": "2.0.0-alpha.66",
"@docusaurus/types": "2.0.0-alpha.66",
"@docusaurus/utils-validation": "2.0.0-alpha.66",
"joi": "^17.2.1",
"@mdx-js/mdx": "^1.5.8",
"@mdx-js/react": "^1.5.8",
"@mdx-js/mdx": "^1.6.21",
"@mdx-js/react": "^1.6.21",
"@types/react-toggle": "^4.0.2",
"clsx": "^1.1.1",
"copy-text-to-clipboard": "^2.2.0",
"infima": "0.2.0-alpha.15",
"joi": "^17.2.1",
"lodash": "^4.17.19",
"parse-numeric-range": "^0.0.2",
"prism-react-renderer": "^1.1.0",
"prismjs": "^1.20.0",
"parse-numeric-range": "^1.2.0",
"prism-react-renderer": "^1.1.1",
"prismjs": "^1.22.0",
"prop-types": "^15.7.2",
"react-router-dom": "^5.1.2",
"react-toggle": "^4.1.1"
Expand Down
9 changes: 3 additions & 6 deletions packages/docusaurus-theme-classic/src/theme/CodeBlock/index.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -116,16 +116,13 @@ export default ({
// Tested above
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
const highlightLinesRange = metastring.match(highlightLinesRangeRegex)![1];
highlightLines = rangeParser
.parse(highlightLinesRange)
.filter((n) => n > 0);
highlightLines = rangeParser(highlightLinesRange).filter((n) => n > 0);
}

if (metastring && codeBlockTitleRegex.test(metastring)) {
// Tested above
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
codeBlockTitle = metastring
.match(codeBlockTitleRegex)![1];
codeBlockTitle = metastring.match(codeBlockTitleRegex)![1];
}

let language =
Expand Down Expand Up @@ -180,7 +177,7 @@ export default ({
index += 1;
}
}
highlightLines = rangeParser.parse(range);
highlightLines = rangeParser(range);
code = lines.join('\n');
}

Expand Down
8 changes: 3 additions & 5 deletions packages/docusaurus-theme-classic/src/theme/TOC/index.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
*/

import React from 'react';

import clsx from 'clsx';
import useTOCHighlight from '@theme/hooks/useTOCHighlight';
import type {TOCProps} from '@theme/TOC';
import styles from './styles.module.css';
Expand All @@ -23,9 +23,7 @@ function Headings({headings, isChild}: TOCProps & {isChild?: boolean}) {
return (
<ul
className={
isChild
? ''
: 'table-of-contents table-of-contents__left-border thin-scrollbar'
isChild ? '' : 'table-of-contents table-of-contents__left-border'
}>
{headings.map((heading) => (
<li key={heading.id}>
Expand All @@ -46,7 +44,7 @@ function Headings({headings, isChild}: TOCProps & {isChild?: boolean}) {
function TOC({headings}: TOCProps): JSX.Element {
useTOCHighlight(LINK_CLASS_NAME, ACTIVE_LINK_CLASS_NAME, TOP_OFFSET);
return (
<div className={styles.tableOfContents}>
<div className={clsx(styles.tableOfContents, 'thin-scrollbar')}>
<Headings headings={headings} />
</div>
);
Expand Down
6 changes: 3 additions & 3 deletions packages/docusaurus-theme-live-codeblock/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@
"@docusaurus/core": "2.0.0-alpha.66",
"@philpl/buble": "^0.19.7",
"clsx": "^1.1.1",
"parse-numeric-range": "^0.0.2",
"prism-react-renderer": "^1.1.0",
"react-live": "^2.2.1"
"parse-numeric-range": "^1.2.0",
"prism-react-renderer": "^1.1.1",
"react-live": "^2.2.3"
},
"peerDependencies": {
"react": "^16.8.4",
Expand Down
4 changes: 2 additions & 2 deletions packages/docusaurus-theme-search-algolia/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@
"@docsearch/react": "^1.0.0-alpha.27",
"@docusaurus/core": "2.0.0-alpha.66",
"@docusaurus/utils": "2.0.0-alpha.66",
"joi": "^17.2.1",
"algoliasearch": "^4.0.0",
"algoliasearch-helper": "^3.1.1",
"clsx": "^1.1.1",
"eta": "^1.1.1",
"eta": "^1.11.0",
"joi": "^17.2.1",
"lodash": "^4.17.19"
},
"peerDependencies": {
Expand Down
Loading

0 comments on commit 8e8861e

Please sign in to comment.