From c590537c521dcd1a9cdd7feb5e58371ae504e8d3 Mon Sep 17 00:00:00 2001 From: Bartosz Kaszubowski Date: Sun, 29 Nov 2020 13:07:00 +0100 Subject: [PATCH 01/11] ci(v2): test swizzle on CI using v2 website --- .github/workflows/swizzle-test.yml | 48 ++++++++++++++++++++++++++++++ package.json | 1 + 2 files changed, 49 insertions(+) create mode 100644 .github/workflows/swizzle-test.yml diff --git a/.github/workflows/swizzle-test.yml b/.github/workflows/swizzle-test.yml new file mode 100644 index 000000000000..2b42d8442e7f --- /dev/null +++ b/.github/workflows/swizzle-test.yml @@ -0,0 +1,48 @@ +name: Swizzle Test + +on: + # Trigger the workflow on pull request, + # but only for the master branch + pull_request: + branches: + - master + +jobs: + build: + runs-on: ubuntu-latest + strategy: + matrix: + node-version: [10.x] + steps: + - uses: actions/checkout@v1 + - name: Use Node.js ${{ matrix.node-version }} + uses: actions/setup-node@v1 + with: + node-version: ${{ matrix.node-version }} + - name: Installation + run: yarn + - name: Swizzle most of theme-classic components + run: | + yarn swizzle:v2 AnnouncementBar --danger + yarn swizzle:v2 BlogListPage --danger + yarn swizzle:v2 BlogListPaginator --danger + yarn swizzle:v2 BlogPostItem --danger + yarn swizzle:v2 BlogPostPage --danger + yarn swizzle:v2 BlogPostPaginator --danger + yarn swizzle:v2 BlogSidebar --danger + yarn swizzle:v2 BlogTagsListPage --danger + yarn swizzle:v2 BlogTagsPostsPage --danger + yarn swizzle:v2 DocItem --danger + yarn swizzle:v2 DocPage --danger + yarn swizzle:v2 DocPaginator --danger + yarn swizzle:v2 DocSidebar + yarn swizzle:v2 Footer + yarn swizzle:v2 Heading --danger + yarn swizzle:v2 Navbar --danger + yarn swizzle:v2 NavbarItem --danger + yarn swizzle:v2 TabItem --danger + yarn swizzle:v2 Tabs --danger + yarn swizzle:v2 TOC --danger + yarn swizzle:v2 Toggle --danger + - name: Build with swizzled components + yarn test:build:v2 diff --git a/package.json b/package.json index 835b15f61c7e..0e485cd76882 100644 --- a/package.json +++ b/package.json @@ -30,6 +30,7 @@ "serve:v2:ssl:gencert": "openssl req -x509 -nodes -days 365 -newkey rsa:4096 -subj \"/C=US/ST=Docusaurus/L=Anywhere/O=Dis/CN=localhost\" -keyout ./website/.docusaurus/selfsigned.key -out ./website/.docusaurus/selfsigned.crt", "serve:v2:ssl:message": "echo '\n\n\nServing Docusaurus with HTTPS on localhost requires to disable the Chrome security: chrome://flags/#allow-insecure-localhost\n\n\n'", "serve:v2:ssl:serve": "serve website/build --ssl-cert ./website/.docusaurus/selfsigned.crt --ssl-key ./website/.docusaurus/selfsigned.key", + "swizzle:v2": "yarn workspace docusaurus-2-website swizzle @docusaurus/theme-classic", "crowdin:upload:v2": "crowdin upload sources --config ./crowdin-v2.yaml", "crowdin:uploadTranslations:v2": "crowdin upload translations --config ./crowdin-v2.yaml", "crowdin:download:v2": "crowdin download --config ./crowdin-v2.yaml", From ab7c41ec19d4eee7853a41e9e53dff1cba59f93b Mon Sep 17 00:00:00 2001 From: Bartosz Kaszubowski Date: Sun, 29 Nov 2020 13:28:53 +0100 Subject: [PATCH 02/11] fix script syntax --- .github/workflows/swizzle-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/swizzle-test.yml b/.github/workflows/swizzle-test.yml index 2b42d8442e7f..79b61e3b5df2 100644 --- a/.github/workflows/swizzle-test.yml +++ b/.github/workflows/swizzle-test.yml @@ -45,4 +45,4 @@ jobs: yarn swizzle:v2 TOC --danger yarn swizzle:v2 Toggle --danger - name: Build with swizzled components - yarn test:build:v2 + run: yarn test:build:v2 From 43c4d61be92dfb2e7d4748d368592cca4b52c6c4 Mon Sep 17 00:00:00 2001 From: Bartosz Kaszubowski Date: Sun, 29 Nov 2020 13:38:40 +0100 Subject: [PATCH 03/11] do not build Docusuaurs twice during workflow --- .github/workflows/swizzle-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/swizzle-test.yml b/.github/workflows/swizzle-test.yml index 79b61e3b5df2..565e77fb857e 100644 --- a/.github/workflows/swizzle-test.yml +++ b/.github/workflows/swizzle-test.yml @@ -45,4 +45,4 @@ jobs: yarn swizzle:v2 TOC --danger yarn swizzle:v2 Toggle --danger - name: Build with swizzled components - run: yarn test:build:v2 + run: yarn build:v2 From e94fc109c8d59a1c9f0c0dee7ed37fdbd187db9d Mon Sep 17 00:00:00 2001 From: Bartosz Kaszubowski Date: Sun, 29 Nov 2020 14:08:15 +0100 Subject: [PATCH 04/11] add search-algolia and live-codeblock components to swizzle --- .github/workflows/swizzle-test.yml | 10 +++++++++- package.json | 2 ++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.github/workflows/swizzle-test.yml b/.github/workflows/swizzle-test.yml index 565e77fb857e..67a6ebfa83a1 100644 --- a/.github/workflows/swizzle-test.yml +++ b/.github/workflows/swizzle-test.yml @@ -21,7 +21,7 @@ jobs: node-version: ${{ matrix.node-version }} - name: Installation run: yarn - - name: Swizzle most of theme-classic components + - name: Swizzle most of `theme-classic` components run: | yarn swizzle:v2 AnnouncementBar --danger yarn swizzle:v2 BlogListPage --danger @@ -44,5 +44,13 @@ jobs: yarn swizzle:v2 Tabs --danger yarn swizzle:v2 TOC --danger yarn swizzle:v2 Toggle --danger + - name: Swizzle most of `theme-search-algolia` components + run: | + yarn swizzle:v2:algolia SearchBar + yarn swizzle:v2:algolia SearchPage + - name: Swizzle most of `theme-live-codeblock` components + run: | + yarn swizzle:v2:codeblock CodeBlock + yarn swizzle:v2:codeblock Playground - name: Build with swizzled components run: yarn build:v2 diff --git a/package.json b/package.json index 0e485cd76882..9212cb1d6be9 100644 --- a/package.json +++ b/package.json @@ -31,6 +31,8 @@ "serve:v2:ssl:message": "echo '\n\n\nServing Docusaurus with HTTPS on localhost requires to disable the Chrome security: chrome://flags/#allow-insecure-localhost\n\n\n'", "serve:v2:ssl:serve": "serve website/build --ssl-cert ./website/.docusaurus/selfsigned.crt --ssl-key ./website/.docusaurus/selfsigned.key", "swizzle:v2": "yarn workspace docusaurus-2-website swizzle @docusaurus/theme-classic", + "swizzle:v2:algolia": "yarn workspace docusaurus-2-website swizzle @docusaurus/theme-search-algolia", + "swizzle:v2:codeblock": "yarn workspace docusaurus-2-website swizzle @docusaurus/theme-live-codeblock", "crowdin:upload:v2": "crowdin upload sources --config ./crowdin-v2.yaml", "crowdin:uploadTranslations:v2": "crowdin upload translations --config ./crowdin-v2.yaml", "crowdin:download:v2": "crowdin download --config ./crowdin-v2.yaml", From 5a2dcd7afb39da71b6cbd70a603694448e729585 Mon Sep 17 00:00:00 2001 From: Bartosz Kaszubowski Date: Mon, 30 Nov 2020 17:18:14 +0100 Subject: [PATCH 05/11] add missing entries from swizzleAllowedComponents --- .github/workflows/swizzle-test.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/swizzle-test.yml b/.github/workflows/swizzle-test.yml index 67a6ebfa83a1..d6d5a88051f0 100644 --- a/.github/workflows/swizzle-test.yml +++ b/.github/workflows/swizzle-test.yml @@ -40,10 +40,13 @@ jobs: yarn swizzle:v2 Heading --danger yarn swizzle:v2 Navbar --danger yarn swizzle:v2 NavbarItem --danger + yarn swizzle:v2 NotFound yarn swizzle:v2 TabItem --danger yarn swizzle:v2 Tabs --danger yarn swizzle:v2 TOC --danger yarn swizzle:v2 Toggle --danger + yarn swizzle:v2 hooks/useTheme + yarn swizzle:v2 prism-include-languages - name: Swizzle most of `theme-search-algolia` components run: | yarn swizzle:v2:algolia SearchBar From afe25bcaf4101c262e560ebeb136b1424a4595f8 Mon Sep 17 00:00:00 2001 From: Bartosz Kaszubowski Date: Tue, 1 Dec 2020 18:05:35 +0100 Subject: [PATCH 06/11] cleanup workflow script --- .github/workflows/swizzle-test.yml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/.github/workflows/swizzle-test.yml b/.github/workflows/swizzle-test.yml index d6d5a88051f0..e832a2a1f109 100644 --- a/.github/workflows/swizzle-test.yml +++ b/.github/workflows/swizzle-test.yml @@ -1,8 +1,6 @@ name: Swizzle Test on: - # Trigger the workflow on pull request, - # but only for the master branch pull_request: branches: - master @@ -12,13 +10,13 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - node-version: [10.x] + node: ['10'] steps: - uses: actions/checkout@v1 - - name: Use Node.js ${{ matrix.node-version }} + - name: Use Node.js ${{ matrix.node }} uses: actions/setup-node@v1 with: - node-version: ${{ matrix.node-version }} + node-version: ${{ matrix.node }} - name: Installation run: yarn - name: Swizzle most of `theme-classic` components From 0c729fa4009332395e8e68823660a15f53fceecb Mon Sep 17 00:00:00 2001 From: Bartosz Kaszubowski Date: Mon, 7 Dec 2020 14:19:47 +0100 Subject: [PATCH 07/11] chore(ci): add DocVersionSuggestions to the list --- .github/workflows/swizzle-test.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/swizzle-test.yml b/.github/workflows/swizzle-test.yml index e832a2a1f109..04b02a3200ee 100644 --- a/.github/workflows/swizzle-test.yml +++ b/.github/workflows/swizzle-test.yml @@ -34,6 +34,7 @@ jobs: yarn swizzle:v2 DocPage --danger yarn swizzle:v2 DocPaginator --danger yarn swizzle:v2 DocSidebar + yarn swizzle:v2 DocVersionSuggestions --danger yarn swizzle:v2 Footer yarn swizzle:v2 Heading --danger yarn swizzle:v2 Navbar --danger From d81db71806e673514db783b47b762bb26b8bef64 Mon Sep 17 00:00:00 2001 From: Bartosz Kaszubowski Date: Mon, 7 Dec 2020 14:39:15 +0100 Subject: [PATCH 08/11] chore(ci): use Node 12 --- .github/workflows/swizzle-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/swizzle-test.yml b/.github/workflows/swizzle-test.yml index 04b02a3200ee..c264e4db3b04 100644 --- a/.github/workflows/swizzle-test.yml +++ b/.github/workflows/swizzle-test.yml @@ -10,7 +10,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - node: ['10'] + node: ['12'] steps: - uses: actions/checkout@v1 - name: Use Node.js ${{ matrix.node }} From 3d63a1a1e7f66f295602f78a357ea20e6730a848 Mon Sep 17 00:00:00 2001 From: Bartosz Kaszubowski Date: Mon, 7 Dec 2020 17:27:37 +0100 Subject: [PATCH 09/11] chore(v2): test swizzle on CI using only one language --- .github/workflows/swizzle-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/swizzle-test.yml b/.github/workflows/swizzle-test.yml index c264e4db3b04..f7138a9ffd8a 100644 --- a/.github/workflows/swizzle-test.yml +++ b/.github/workflows/swizzle-test.yml @@ -55,4 +55,4 @@ jobs: yarn swizzle:v2:codeblock CodeBlock yarn swizzle:v2:codeblock Playground - name: Build with swizzled components - run: yarn build:v2 + run: yarn build:v2:en From d4d30fc9412df5120a88837b1c1208c8dbd4b230 Mon Sep 17 00:00:00 2001 From: Bartosz Kaszubowski Date: Tue, 16 Feb 2021 14:31:44 +0100 Subject: [PATCH 10/11] Apply bumps from suggestions Co-authored-by: HonkingGoose <34918129+HonkingGoose@users.noreply.github.com> --- .github/workflows/swizzle-test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/swizzle-test.yml b/.github/workflows/swizzle-test.yml index f7138a9ffd8a..8117b149be94 100644 --- a/.github/workflows/swizzle-test.yml +++ b/.github/workflows/swizzle-test.yml @@ -12,9 +12,9 @@ jobs: matrix: node: ['12'] steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v2 - name: Use Node.js ${{ matrix.node }} - uses: actions/setup-node@v1 + uses: actions/setup-node@v2 with: node-version: ${{ matrix.node }} - name: Installation From 08b1a82f31755c88a12725505d5d305f824a3d3d Mon Sep 17 00:00:00 2001 From: Bartosz Kaszubowski Date: Tue, 16 Feb 2021 17:15:24 +0100 Subject: [PATCH 11/11] =?UTF-8?q?blind=20shot=20bump=20=F0=9F=A4=B7?= =?UTF-8?q?=E2=80=8D=E2=99=82=EF=B8=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/swizzle-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/swizzle-test.yml b/.github/workflows/swizzle-test.yml index 8117b149be94..3f2146e848a6 100644 --- a/.github/workflows/swizzle-test.yml +++ b/.github/workflows/swizzle-test.yml @@ -10,7 +10,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - node: ['12'] + node: ['14'] steps: - uses: actions/checkout@v2 - name: Use Node.js ${{ matrix.node }}