Merge remote-tracking branch 'origin/master' into lex111/iss2220

.devcontainer/devcontainer.json

@@ -1,10 +1,10 @@
 {
   "name": "Docusaurus Dev Container",
-  "image": "mcr.microsoft.com/vscode/devcontainers/typescript-node:0-10-buster",
+  "image": "mcr.microsoft.com/vscode/devcontainers/typescript-node:14-buster",
   "settings": {
     "terminal.integrated.shell.linux": "/bin/bash"
   },
-  "extensions": ["dbaeumer.vscode-eslint"],
+  "extensions": ["dbaeumer.vscode-eslint", "orta.vscode-jest"],
   "forwardPorts": [3000],
   "postCreateCommand": "yarn install"
 }

.eslintrc.js

@@ -65,6 +65,7 @@ module.exports = {
     'jsx-a11y/no-noninteractive-element-interactions': WARNING,
     'no-console': OFF,
     'no-else-return': OFF,
+    'no-param-reassign': [WARNING, {props: false}],
     'no-underscore-dangle': OFF,
     curly: [WARNING, 'all'],
     'react/jsx-closing-bracket-location': OFF, // Conflicts with Prettier.
@@ -90,6 +91,7 @@ module.exports = {
     ],
     'no-unused-vars': OFF,
     'no-nested-ternary': WARNING,
+    '@typescript-eslint/no-empty-function': OFF,
     '@typescript-eslint/no-unused-vars': [ERROR, {argsIgnorePattern: '^_'}],
     '@typescript-eslint/ban-ts-comment': [
       ERROR,
@@ -102,13 +104,11 @@ module.exports = {
     'import/no-extraneous-dependencies': ERROR,
     'no-useless-escape': WARNING,
     'prefer-template': WARNING,
-    'no-param-reassign': WARNING,
     'no-template-curly-in-string': WARNING,
     'array-callback-return': WARNING,
     camelcase: WARNING,
     'no-restricted-syntax': WARNING,
     'no-unused-expressions': WARNING,
-    '@typescript-eslint/no-empty-function': WARNING,
     'global-require': WARNING,
     'prefer-destructuring': WARNING,
     yoda: WARNING,
@@ -132,6 +132,12 @@ module.exports = {
         'header/header': OFF,
       },
     },
+    {
+      files: ['*.d.ts'],
+      rules: {
+        'import/no-duplicates': OFF,
+      },
+    },
     {
       files: ['*.js'],
       rules: {

.github/workflows/canary-releases.yml → .github/workflows/canary-release.yml

@@ -1,35 +1,22 @@
-name: Canary releases
+name: Canary Release
 
 on:
   push:
     branches:
       - master
+    paths:
+      - 'packages/**'
 
 jobs:
-  checkPackagesHaveChanged:
-    runs-on: ubuntu-latest
-    outputs:
-      packagesHaveChanged: ${{ steps.filter.outputs.packagesHaveChanged }}
-    steps:
-      - uses: actions/checkout@v2
-      - uses: dorny/paths-filter@v2
-        id: filter
-        with:
-          filters: |
-            packagesHaveChanged:
-              - 'packages/**'
-
   publish-canary:
-    needs: checkPackagesHaveChanged
-    if: ${{ needs.checkPackagesHaveChanged.outputs.packagesHaveChanged == 'true' }}
     runs-on: ubuntu-latest
     strategy:
       matrix:
         node-version: [12.x]
     steps:
       - uses: actions/checkout@v2
       - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v1
+        uses: actions/setup-node@v2
         with:
           node-version: ${{ matrix.node-version }}
       - name: Prepare git

.github/workflows/lint.yml

@@ -0,0 +1,24 @@
+name: Lint
+
+on:
+  pull_request:
+    branches:
+      - master
+
+jobs:
+  lint:
+    timeout-minutes: 30
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-node@v2
+      - name: Installation
+        uses: bahmutov/npm-install@v1
+        with:
+          install-command: yarn
+      - name: Lint
+        run: yarn lint:ci
+      - name: Prettier Code
+        run: yarn prettier:diff
+      - name: Prettier Docs
+        run: yarn prettier-docs:diff

.github/workflows/migration-cli-e2e-test.yml → .github/workflows/migration-cli.yml

@@ -1,37 +1,30 @@
-name: Migration CLI E2E Test
+name: Migration CLI
 
 on:
   pull_request:
     branches:
       - master
+    paths:
+      - packages/docusaurus-migration/**
+      - website-1.x/**
 
 jobs:
-  check:
-    runs-on: ubuntu-latest
-    outputs:
-      migration: ${{ steps.filter.outputs.migration }}
-    steps:
-      - uses: dorny/paths-filter@v2
-        id: filter
-        with:
-          filters: |
-            migration:
-              - 'packages/docusaurus-migration/**'
   build:
-    needs: check
-    if: ${{ needs.check.outputs.migration == 'true' }}
+    timeout-minutes: 30
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node: ['12']
+        node: ['12', '14']
     steps:
       - 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
-        run: yarn
+        uses: bahmutov/npm-install@v1
+        with:
+          install-command: yarn
       - name: Migrate D1 website
         run: yarn test:v1Migration:migrate
       - name: Build D1 migrated website

.github/workflows/v1-tests-windows.yml

@@ -0,0 +1,29 @@
+name: V1 Tests Windows
+
+on:
+  pull_request:
+    branches:
+      - master
+    paths:
+      - 'website-1.x/**'
+      - 'packages/docusaurus-1.x/**'
+      - 'packages/docusaurus-init-1.x/**'
+
+jobs:
+  build:
+    timeout-minutes: 30
+    runs-on: windows-latest
+    strategy:
+      matrix:
+        node: ['12', '14']
+    steps:
+      - uses: actions/checkout@v2
+      - name: Use Node.js ${{ matrix.node }}
+        uses: actions/setup-node@v2
+        with:
+          node-version: ${{ matrix.node }}
+      - name: Installation
+        run: yarn || yarn || yarn # 3 attempts to avoid timeout errors...
+      - name: Docusaurus 1 Tests
+        run: yarn test:v1
+      # Not useful to build v1 site because tests already build v1 (packages/docusaurus-1.x/lib/__tests__/build-files.test.js)

.github/workflows/v1-tests.yml

@@ -0,0 +1,31 @@
+name: V1 Tests
+
+on:
+  pull_request:
+    branches:
+      - master
+    paths:
+      - 'website-1.x/**'
+      - 'packages/docusaurus-1.x/**'
+      - 'packages/docusaurus-init-1.x/**'
+
+jobs:
+  test:
+    timeout-minutes: 30
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        node: ['12', '14']
+    steps:
+      - uses: actions/checkout@v2
+      - name: Use Node.js ${{ matrix.node }}
+        uses: actions/setup-node@v2
+        with:
+          node-version: ${{ matrix.node }}
+      - name: Installation
+        uses: bahmutov/npm-install@v1
+        with:
+          install-command: yarn
+      - name: Test
+        run: yarn test:v1
+      # Not useful to build v1 site because tests already build v1 (packages/docusaurus-1.x/lib/__tests__/build-files.test.js)

.github/workflows/v2-build-blog-only.yml

@@ -0,0 +1,23 @@
+name: V2 Build Blog-only
+
+on:
+  pull_request:
+    branches:
+      - master
+    paths:
+      - 'website-1.x/blog/**'
+      - 'packages/docusaurus/**'
+
+jobs:
+  build:
+    timeout-minutes: 30
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-node@v2
+      - name: Installation
+        uses: bahmutov/npm-install@v1
+        with:
+          install-command: yarn
+      - name: Build blog-only
+        run: yarn workspace docusaurus-2-website build:blogOnly