From ccbc3caf5798bf2f91b16b5121bed1fdefeb1082 Mon Sep 17 00:00:00 2001 From: Armano Date: Thu, 25 Nov 2021 03:54:19 +0100 Subject: [PATCH 1/6] deps: update npm-to-yarn to fork --- README.md | 4 ++-- examples/classic-typescript/docs/intro.md | 2 +- examples/classic/docs/intro.md | 2 +- examples/facebook/docs/intro.md | 2 +- .../create-docusaurus/templates/shared/docs/intro.md | 2 +- .../docusaurus-remark-plugin-npm2yarn/package.json | 2 +- .../docusaurus-remark-plugin-npm2yarn/src/index.ts | 2 +- website/package.json | 2 +- yarn.lock | 10 +++++----- 9 files changed, 14 insertions(+), 14 deletions(-) diff --git a/README.md b/README.md index 30cfb48e7ce9..5802799b4390 100644 --- a/README.md +++ b/README.md @@ -47,13 +47,13 @@ Short on time? Check out our [5-minute tutorial ⏱️](https://tutorial.docusau Use the initialization cli to create your site: -```bash +```bash npm2yarn npm init docusaurus@latest [name] [template] ``` Example: -```bash +```bash npm2yarn npm init docusaurus@latest my-website classic ``` diff --git a/examples/classic-typescript/docs/intro.md b/examples/classic-typescript/docs/intro.md index e762190b4941..d9f2b55119ec 100644 --- a/examples/classic-typescript/docs/intro.md +++ b/examples/classic-typescript/docs/intro.md @@ -16,7 +16,7 @@ Or **try Docusaurus immediately** with **[docusaurus.new](https://docusaurus.new Generate a new Docusaurus site using the **classic template**: -```shell +```shell npm2yarn npm init docusaurus@latest my-website classic ``` diff --git a/examples/classic/docs/intro.md b/examples/classic/docs/intro.md index e762190b4941..d9f2b55119ec 100644 --- a/examples/classic/docs/intro.md +++ b/examples/classic/docs/intro.md @@ -16,7 +16,7 @@ Or **try Docusaurus immediately** with **[docusaurus.new](https://docusaurus.new Generate a new Docusaurus site using the **classic template**: -```shell +```shell npm2yarn npm init docusaurus@latest my-website classic ``` diff --git a/examples/facebook/docs/intro.md b/examples/facebook/docs/intro.md index 8417aebee8c7..05d190a52716 100644 --- a/examples/facebook/docs/intro.md +++ b/examples/facebook/docs/intro.md @@ -16,7 +16,7 @@ Or **try Docusaurus immediately** with **[docusaurus.new](https://docusaurus.new Generate a new Docusaurus site using the **classic template**: -```shell +```shell npm2yarn npm init docusaurus@latest my-website classic ``` diff --git a/packages/create-docusaurus/templates/shared/docs/intro.md b/packages/create-docusaurus/templates/shared/docs/intro.md index 8417aebee8c7..05d190a52716 100644 --- a/packages/create-docusaurus/templates/shared/docs/intro.md +++ b/packages/create-docusaurus/templates/shared/docs/intro.md @@ -16,7 +16,7 @@ Or **try Docusaurus immediately** with **[docusaurus.new](https://docusaurus.new Generate a new Docusaurus site using the **classic template**: -```shell +```shell npm2yarn npm init docusaurus@latest my-website classic ``` diff --git a/packages/docusaurus-remark-plugin-npm2yarn/package.json b/packages/docusaurus-remark-plugin-npm2yarn/package.json index b5de28b4b078..71c7dfa8f276 100644 --- a/packages/docusaurus-remark-plugin-npm2yarn/package.json +++ b/packages/docusaurus-remark-plugin-npm2yarn/package.json @@ -17,7 +17,7 @@ }, "license": "MIT", "dependencies": { - "npm-to-yarn": "^1.0.1", + "@armano/npm-to-yarn": "^1.0.3", "unist-util-visit": "^2.0.2" }, "devDependencies": { diff --git a/packages/docusaurus-remark-plugin-npm2yarn/src/index.ts b/packages/docusaurus-remark-plugin-npm2yarn/src/index.ts index 7f80ed367824..a0f4b41c5e29 100644 --- a/packages/docusaurus-remark-plugin-npm2yarn/src/index.ts +++ b/packages/docusaurus-remark-plugin-npm2yarn/src/index.ts @@ -9,7 +9,7 @@ import type {Code, Content, Literal} from 'mdast'; import type {Plugin, Transformer} from 'unified'; import type {Node, Parent} from 'unist'; import visit from 'unist-util-visit'; -import npmToYarn from 'npm-to-yarn'; +import npmToYarn from '@armano/npm-to-yarn'; interface PluginOptions { sync?: boolean; diff --git a/website/package.json b/website/package.json index 176f2a22795b..470c26d42e7b 100644 --- a/website/package.json +++ b/website/package.json @@ -45,7 +45,7 @@ "esbuild-loader": "2.13.1", "hast-util-is-element": "1.1.0", "netlify-plugin-cache": "^1.0.3", - "npm-to-yarn": "^1.0.0-2", + "@armano/npm-to-yarn": "^1.0.3", "react": "^17.0.2", "react-dom": "^17.0.2", "react-popper": "^2.2.5", diff --git a/yarn.lock b/yarn.lock index 094867335ddd..0991c05ec623 100644 --- a/yarn.lock +++ b/yarn.lock @@ -134,6 +134,11 @@ jsonpointer "^5.0.0" leven "^3.1.0" +"@armano/npm-to-yarn@^1.0.3": + version "1.0.3" + resolved "https://registry.yarnpkg.com/@armano/npm-to-yarn/-/npm-to-yarn-1.0.3.tgz#2e7a6ad7331be432dce54a942c4e210448781614" + integrity sha512-7xrLjaL7P05wR0KbE3iixwDbhDijGjE+2t3zAgIOYRLxJgZN2VMmb0Yx40Pz9iY23CK47V2kYxrfhDKKJsda6Q== + "@babel/cli@^7.16.0": version "7.16.0" resolved "https://registry.yarnpkg.com/@babel/cli/-/cli-7.16.0.tgz#a729b7a48eb80b49f48a339529fc4129fd7bcef3" @@ -14969,11 +14974,6 @@ npm-run-path@^4.0.0, npm-run-path@^4.0.1: dependencies: path-key "^3.0.0" -npm-to-yarn@^1.0.0-2, npm-to-yarn@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/npm-to-yarn/-/npm-to-yarn-1.0.1.tgz#6cdb95114c4ff0be50a7a2381d4d16131a5f52df" - integrity sha512-bp8T8oNMfLW+N/fE0itFfSu7RReytwhqNd9skbkfHfzGYC+5CCdzS2HnaXz6JiG4AlK2eA0qlT6NJN1SoFvcWQ== - npmlog@^4.0.1, npmlog@^4.0.2, npmlog@^4.1.2: version "4.1.2" resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b" From d8a5985074af53cbced2c69ee2f4c76c7025fb77 Mon Sep 17 00:00:00 2001 From: Armano Date: Thu, 25 Nov 2021 04:29:59 +0100 Subject: [PATCH 2/6] chore: revert changes in examples --- examples/classic-typescript/docs/intro.md | 2 +- examples/classic/docs/intro.md | 2 +- examples/facebook/docs/intro.md | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/examples/classic-typescript/docs/intro.md b/examples/classic-typescript/docs/intro.md index d9f2b55119ec..e762190b4941 100644 --- a/examples/classic-typescript/docs/intro.md +++ b/examples/classic-typescript/docs/intro.md @@ -16,7 +16,7 @@ Or **try Docusaurus immediately** with **[docusaurus.new](https://docusaurus.new Generate a new Docusaurus site using the **classic template**: -```shell npm2yarn +```shell npm init docusaurus@latest my-website classic ``` diff --git a/examples/classic/docs/intro.md b/examples/classic/docs/intro.md index d9f2b55119ec..e762190b4941 100644 --- a/examples/classic/docs/intro.md +++ b/examples/classic/docs/intro.md @@ -16,7 +16,7 @@ Or **try Docusaurus immediately** with **[docusaurus.new](https://docusaurus.new Generate a new Docusaurus site using the **classic template**: -```shell npm2yarn +```shell npm init docusaurus@latest my-website classic ``` diff --git a/examples/facebook/docs/intro.md b/examples/facebook/docs/intro.md index 05d190a52716..8417aebee8c7 100644 --- a/examples/facebook/docs/intro.md +++ b/examples/facebook/docs/intro.md @@ -16,7 +16,7 @@ Or **try Docusaurus immediately** with **[docusaurus.new](https://docusaurus.new Generate a new Docusaurus site using the **classic template**: -```shell npm2yarn +```shell npm init docusaurus@latest my-website classic ``` From 94ae23f6a36d464eb8905ee4960cbeec78dc8561 Mon Sep 17 00:00:00 2001 From: Armano Date: Thu, 25 Nov 2021 13:54:59 +0100 Subject: [PATCH 3/6] chore: revert change in readme Co-authored-by: Joshua Chen --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 5802799b4390..b53568898088 100644 --- a/README.md +++ b/README.md @@ -47,7 +47,7 @@ Short on time? Check out our [5-minute tutorial ⏱️](https://tutorial.docusau Use the initialization cli to create your site: -```bash npm2yarn +```bash npm init docusaurus@latest [name] [template] ``` From 6202e92250db433b1905d9a33ca382cb6ca3e559 Mon Sep 17 00:00:00 2001 From: Armano Date: Thu, 25 Nov 2021 13:55:49 +0100 Subject: [PATCH 4/6] chore: revert change in readme --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index b53568898088..30cfb48e7ce9 100644 --- a/README.md +++ b/README.md @@ -53,7 +53,7 @@ npm init docusaurus@latest [name] [template] Example: -```bash npm2yarn +```bash npm init docusaurus@latest my-website classic ``` From c7b171c603382e9effbbf89fe9e80fd7ac1feb96 Mon Sep 17 00:00:00 2001 From: Armano Date: Tue, 30 Nov 2021 17:31:39 +0100 Subject: [PATCH 5/6] chore: update npm-to-yarn --- packages/docusaurus-remark-plugin-npm2yarn/package.json | 2 +- website/package.json | 2 +- yarn.lock | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/docusaurus-remark-plugin-npm2yarn/package.json b/packages/docusaurus-remark-plugin-npm2yarn/package.json index 71c7dfa8f276..db7cbbed4fe8 100644 --- a/packages/docusaurus-remark-plugin-npm2yarn/package.json +++ b/packages/docusaurus-remark-plugin-npm2yarn/package.json @@ -17,7 +17,7 @@ }, "license": "MIT", "dependencies": { - "@armano/npm-to-yarn": "^1.0.3", + "@armano/npm-to-yarn": "^1.1.2", "unist-util-visit": "^2.0.2" }, "devDependencies": { diff --git a/website/package.json b/website/package.json index 470c26d42e7b..dbfccd9024eb 100644 --- a/website/package.json +++ b/website/package.json @@ -45,7 +45,7 @@ "esbuild-loader": "2.13.1", "hast-util-is-element": "1.1.0", "netlify-plugin-cache": "^1.0.3", - "@armano/npm-to-yarn": "^1.0.3", + "@armano/npm-to-yarn": "^1.1.2", "react": "^17.0.2", "react-dom": "^17.0.2", "react-popper": "^2.2.5", diff --git a/yarn.lock b/yarn.lock index 0991c05ec623..1fec44e1d3a2 100644 --- a/yarn.lock +++ b/yarn.lock @@ -134,10 +134,10 @@ jsonpointer "^5.0.0" leven "^3.1.0" -"@armano/npm-to-yarn@^1.0.3": - version "1.0.3" - resolved "https://registry.yarnpkg.com/@armano/npm-to-yarn/-/npm-to-yarn-1.0.3.tgz#2e7a6ad7331be432dce54a942c4e210448781614" - integrity sha512-7xrLjaL7P05wR0KbE3iixwDbhDijGjE+2t3zAgIOYRLxJgZN2VMmb0Yx40Pz9iY23CK47V2kYxrfhDKKJsda6Q== +"@armano/npm-to-yarn@^1.1.2": + version "1.1.2" + resolved "https://registry.yarnpkg.com/@armano/npm-to-yarn/-/npm-to-yarn-1.1.2.tgz#3518758123bf1bdb447949053721d283fc8bf2ae" + integrity sha512-rDxYtk9LEZqZkLth/sIZLmC4boUgSKY/8/zgd+OA9x8W2s2MAPAcxGlfvBpIkXloEFKt3OLgfHVSWTFR1f3YpA== "@babel/cli@^7.16.0": version "7.16.0" From 342e043cd3a34714b4998c7bb1cc68b30627906b Mon Sep 17 00:00:00 2001 From: armano2 Date: Sat, 7 May 2022 22:09:48 +0200 Subject: [PATCH 6/6] fix: add missing cspell project-word --- project-words.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/project-words.txt b/project-words.txt index 341e85f935db..faa7a60a494c 100644 --- a/project-words.txt +++ b/project-words.txt @@ -11,6 +11,7 @@ apos appinstalled applanga architecting +armano astro atrule autoconverted