Skip to content

Commit

Permalink
Merge branch 'main' into jc/fix-theme-init
Browse files Browse the repository at this point in the history
  • Loading branch information
slorber committed Dec 3, 2021
2 parents 4647113 + b366ba5 commit c8e994c
Show file tree
Hide file tree
Showing 179 changed files with 5,364 additions and 3,040 deletions.
11 changes: 2 additions & 9 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -49,14 +49,7 @@ module.exports = {
'import/no-unresolved': [
ERROR,
{
ignore: [
'^@theme',
'^@docusaurus',
'^@generated',
'^@site',
'unist',
'mdast',
],
ignore: ['^@theme', '^@docusaurus', '^@generated', '^@site'],
},
],
'import/extensions': OFF,
Expand Down Expand Up @@ -149,6 +142,7 @@ module.exports = {
allowSingleExtends: true,
},
],
'@typescript-eslint/method-signature-style': ERROR,
'no-restricted-imports': [
ERROR,
{
Expand All @@ -167,7 +161,6 @@ module.exports = {
'head',
'tail',
'initial',
'last',
],
message: 'These APIs have their ES counterparts.',
},
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,6 @@ jobs:
- name: Lint
run: yarn lint:ci
- name: Prettier Code
run: yarn prettier:diff
run: yarn format:diff
- name: Prettier Docs
run: yarn prettier-docs:diff
run: yarn format-docs:diff
26 changes: 26 additions & 0 deletions .github/workflows/showcase-test.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
name: Showcase Tests

on:
pull_request:
branches:
- main
paths:
- website/src/data/**

jobs:
validate-config:
name: Validate Showcase Config
timeout-minutes: 30
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Use Node.js ${{ matrix.node }}
uses: actions/setup-node@v2
with:
node-version: ${{ matrix.node }}
cache: yarn
- name: Installation
run: yarn
- name: Test
run: yarn test website/src/data/__tests__/user.test.ts
# TODO another job to optimize the images, see https://github.com/facebook/docusaurus/issues/5980
31 changes: 17 additions & 14 deletions .github/workflows/tests-e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,19 +30,22 @@ jobs:
- name: Installation
run: yarn
- name: Generate test-website project against main branch
run: |
KEEP_CONTAINER=true yarn test:build:website -s
mv test-website ../test-website
run: yarn test:build:website -s
env:
KEEP_CONTAINER: true
- name: Install test-website project with Yarn v1
run: cd ../test-website && yarn install
run: yarn install
working-directory: ../test-website
env:
npm_config_registry: http://localhost:4873
- name: Start test-website project
run: cd ../test-website && yarn start --no-open
run: yarn start --no-open
working-directory: ../test-website
env:
E2E_TEST: true
- name: Build test-website project
run: cd ../test-website && yarn build
run: yarn build
working-directory: ../test-website
env:
CI: true

Expand All @@ -63,15 +66,12 @@ jobs:
cache: yarn
- name: Installation
run: yarn

- name: Generate test-website project against main branch
run: |
KEEP_CONTAINER=true yarn test:build:website -s
mv test-website ../test-website
run: yarn test:build:website -s
env:
KEEP_CONTAINER: true
- name: Install test-website project with Yarn Berry and nodeLinker = ${{ matrix.nodeLinker }}
run: |
cd ../test-website
# we have to switch to berry first before setting the version we want
yarn set version berry
# temporary using canary for #5342
Expand All @@ -84,13 +84,16 @@ jobs:
yarn config set enableGlobalCache true
yarn install
working-directory: ../test-website
env:
YARN_ENABLE_IMMUTABLE_INSTALLS: false # Yarn berry should create the lockfile, despite CI env
- name: Start test-website project
run: cd ../test-website && yarn start --no-open
run: yarn start --no-open
working-directory: ../test-website
env:
E2E_TEST: true
- name: Build test-website project
run: cd ../test-website && yarn build
run: yarn build
working-directory: ../test-website
env:
CI: true
136 changes: 73 additions & 63 deletions CONTRIBUTING.md

Large diffs are not rendered by default.

140 changes: 0 additions & 140 deletions admin/extending-remarkable.md

This file was deleted.

Loading

0 comments on commit c8e994c

Please sign in to comment.