Skip to content

Commit

Permalink
Merge branch 'main' into slorber/plugin-svgr
Browse files Browse the repository at this point in the history
  • Loading branch information
slorber committed Nov 21, 2024
2 parents 430494c + 90e85e8 commit 3295d9d
Show file tree
Hide file tree
Showing 179 changed files with 1,543 additions and 571 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/argos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
node-version: lts/*

- name: Install dependencies
run: yarn install --frozen-lockfile
run: yarn || yarn || yarn

- name: Install Playwright browsers
run: npx playwright install --with-deps chromium
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-blog-only.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,6 @@ jobs:
node-version: lts/*
cache: yarn
- name: Installation
run: yarn
run: yarn || yarn || yarn
- name: Build blog-only
run: yarn workspace website build:blogOnly
2 changes: 1 addition & 1 deletion .github/workflows/build-hash-router.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
node-version: lts/*
cache: yarn
- name: Installation
run: yarn
run: yarn || yarn || yarn

- name: Build Hash Router
run: yarn build:website:fast
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-perf.yml
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ jobs:
node-version: lts/*
cache: yarn
- name: Installation
run: yarn
run: yarn || yarn || yarn

# Ensure build with a cold cache does not increase too much
- name: Build (cold cache)
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/canary-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:
env:
NPM_TOKEN: ${{ secrets.NPM_AUTH_TOKEN }}
- name: Installation
run: yarn
run: yarn || yarn || yarn
- name: Publish Canary release
run: |
yarn canary
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/continuous-releases.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
cache: yarn

- name: Installation
run: yarn
run: yarn || yarn || yarn

- name: Build packages
run: yarn build:packages
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/lighthouse-report.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
node-version: lts/*

- name: Install dependencies
run: yarn install --frozen-lockfile
run: yarn || yarn || yarn

- name: Build website fast
run: yarn build:website:fast
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/lint-autofix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
ref: ${{ github.head_ref }}

- name: Installation
run: yarn
run: yarn || yarn || yarn

- name: AutoFix Format
run: yarn format
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,7 @@ jobs:
node-version: lts/*
cache: yarn
- name: Installation
run: yarn
# run: yarn install --immutable # Fails if yarn.lock is modified (unfortunately only works for Yarn 2, and --frozen-lockfile is not the same!)
run: yarn install --frozen-lockfile || yarn install --frozen-lockfile || yarn install --frozen-lockfile
- name: Check immutable yarn.lock
run: git diff --exit-code

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/showcase-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,6 @@ jobs:
node-version: lts/*
cache: yarn
- name: Installation
run: yarn
run: yarn || yarn || yarn
- name: Test
run: yarn test website/src/data/__tests__/user.test.ts
25 changes: 15 additions & 10 deletions .github/workflows/tests-e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,11 +48,11 @@ jobs:
node-version: ${{ matrix.node }}
cache: yarn
- name: Installation
run: yarn
run: yarn || yarn || yarn
- name: Generate test-website project against main branch
run: yarn test:build:website -s
- name: Install test-website project with Yarn v1
run: yarn install
run: yarn || yarn || yarn
working-directory: ../test-website
env:
npm_config_registry: http://localhost:4873
Expand Down Expand Up @@ -89,7 +89,7 @@ jobs:
node-version: lts/*
cache: yarn
- name: Installation
run: yarn
run: yarn || yarn || yarn
- name: Generate test-website project with ${{ matrix.variant }} against main branch
run: yarn test:build:website ${{ matrix.variant }}
- name: Install test-website project with Yarn Berry and nodeLinker = ${{ matrix.nodeLinker }}
Expand All @@ -105,7 +105,7 @@ jobs:
# https://yarnpkg.com/features/pnp#fallback-mode
yarn config set pnpFallbackMode none
yarn install
yarn || yarn || yarn
working-directory: ../test-website
env:
YARN_ENABLE_IMMUTABLE_INSTALLS: false # Yarn berry should create the lockfile, despite CI env
Expand Down Expand Up @@ -158,14 +158,17 @@ jobs:
node-version: lts/*
cache: yarn
- name: Installation
run: yarn
run: yarn || yarn || yarn
- name: Generate test-website project against main branch
run: yarn test:build:website -s
run: yarn test:build:website -st
- name: Install test-website project with npm
run: npm install
working-directory: ../test-website
env:
npm_config_registry: http://localhost:4873
- name: TypeCheck website
working-directory: ../test-website
run: yarn typecheck
- name: Start test-website project
run: npm run start -- --no-open
working-directory: ../test-website
Expand Down Expand Up @@ -195,17 +198,19 @@ jobs:
node-version: lts/*
cache: yarn
- name: Installation
run: yarn
run: yarn || yarn || yarn
- name: Generate test-website project against main branch
run: yarn test:build:website -s
run: yarn test:build:website -st
- name: Install test-website project with pnpm
run: |
npm install -g pnpm
# Fix some peer dependencies errors
pnpm add @algolia/client-search @types/react@17 typescript
pnpm install
working-directory: ../test-website
env:
npm_config_registry: http://localhost:4873
- name: TypeCheck website
working-directory: ../test-website
run: yarn typecheck
- name: Start test-website project
run: pnpm start --no-open
working-directory: ../test-website
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tests-swizzle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
node-version: lts/*
cache: yarn
- name: Installation
run: yarn
run: yarn || yarn || yarn

# Swizzle all the theme components
- name: Swizzle (${{matrix.action}} - ${{matrix.variant}})
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tests-windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
with:
node-version: ${{ matrix.node }}
- name: Installation
run: yarn || yarn || yarn # 3 attempts to avoid timeout errors...
run: yarn || yarn || yarn
- name: Docusaurus Jest Tests
run: yarn test
- name: Create a deep path
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
node-version: ${{ matrix.node }}
cache: yarn
- name: Installation
run: yarn
run: yarn || yarn || yarn
- name: Test
run: yarn test
- name: Remove Theme Internal Re-export
Expand Down
29 changes: 29 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,34 @@
# Docusaurus Changelog

## 3.6.2 (2024-11-19)

#### :bug: Bug Fix

- `docusaurus-module-type-aliases`
- [#10693](https://github.com/facebook/docusaurus/pull/10693) fix(types): add missing ambiant TS declarations for .md / .mdx partials ([@slorber](https://github.com/slorber))
- `docusaurus-theme-translations`
- [#10688](https://github.com/facebook/docusaurus/pull/10688) fix(theme-translation): add and update Japanese translations ([@Ryoga-exe](https://github.com/Ryoga-exe))
- `docusaurus`
- [#10685](https://github.com/facebook/docusaurus/pull/10685) fix(cli): `docusaurus --help` should print plugin commands using `extendCli()` ([@slorber](https://github.com/slorber))
- `docusaurus-bundler`
- [#10680](https://github.com/facebook/docusaurus/pull/10680) fix(bundler): allow CSS nesting by default, restore postcss-preset-env ([@slorber](https://github.com/slorber))
- `create-docusaurus`
- [#10676](https://github.com/facebook/docusaurus/pull/10676) fix(create-docusaurus): add ts exclude to TS init template ([@slorber](https://github.com/slorber))
- `docusaurus-bundler`, `docusaurus-faster`, `docusaurus`
- [#10648](https://github.com/facebook/docusaurus/pull/10648) fix(faster): Upgrade to Rspack 1.1.1, fix build progress bar display ([@slorber](https://github.com/slorber))

#### :wrench: Maintenance

- [#10691](https://github.com/facebook/docusaurus/pull/10691) chore(ci): retry `yarn install` to ignore temporary network errors ([@slorber](https://github.com/slorber))

#### Committers: 5

- Junior_Gx ([@goffxnca](https://github.com/goffxnca))
- Kyle Tsang ([@kyletsang](https://github.com/kyletsang))
- Ryoga ([@Ryoga-exe](https://github.com/Ryoga-exe))
- Sébastien Lorber ([@slorber](https://github.com/slorber))
- Zwyx ([@Zwyx](https://github.com/Zwyx))

## 3.6.1 (2024-11-08)

#### :bug: Bug Fix
Expand Down
2 changes: 1 addition & 1 deletion admin/new.docusaurus.io/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "new.docusaurus.io",
"version": "3.6.1",
"version": "3.6.2",
"private": true,
"scripts": {
"start": "npx --package netlify-cli netlify dev"
Expand Down
2 changes: 1 addition & 1 deletion admin/test-bad-package/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "test-bad-package",
"version": "3.6.1",
"version": "3.6.2",
"private": true,
"dependencies": {
"@mdx-js/react": "1.0.1",
Expand Down
2 changes: 1 addition & 1 deletion argos/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "argos",
"version": "3.6.1",
"version": "3.6.2",
"description": "Argos visual diff tests",
"license": "MIT",
"private": true,
Expand Down
2 changes: 1 addition & 1 deletion lerna.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "3.6.1",
"version": "3.6.2",
"npmClient": "yarn",
"useWorkspaces": true,
"useNx": false,
Expand Down
6 changes: 3 additions & 3 deletions packages/create-docusaurus/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "create-docusaurus",
"version": "3.6.1",
"version": "3.6.2",
"description": "Create Docusaurus apps easily.",
"type": "module",
"repository": {
Expand All @@ -22,8 +22,8 @@
},
"license": "MIT",
"dependencies": {
"@docusaurus/logger": "3.6.1",
"@docusaurus/utils": "3.6.1",
"@docusaurus/logger": "3.6.2",
"@docusaurus/utils": "3.6.2",
"commander": "^5.1.0",
"fs-extra": "^11.1.1",
"lodash": "^4.17.21",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "docusaurus-2-classic-typescript-template",
"version": "3.6.1",
"version": "3.6.2",
"private": true,
"scripts": {
"docusaurus": "docusaurus",
Expand All @@ -15,18 +15,18 @@
"typecheck": "tsc"
},
"dependencies": {
"@docusaurus/core": "3.6.1",
"@docusaurus/preset-classic": "3.6.1",
"@docusaurus/core": "3.6.2",
"@docusaurus/preset-classic": "3.6.2",
"@mdx-js/react": "^3.0.0",
"clsx": "^2.0.0",
"prism-react-renderer": "^2.3.0",
"react": "^18.0.0",
"react-dom": "^18.0.0"
},
"devDependencies": {
"@docusaurus/module-type-aliases": "3.6.1",
"@docusaurus/tsconfig": "3.6.1",
"@docusaurus/types": "3.6.1",
"@docusaurus/module-type-aliases": "3.6.2",
"@docusaurus/tsconfig": "3.6.2",
"@docusaurus/types": "3.6.2",
"typescript": "~5.6.2"
},
"browserslist": {
Expand Down
10 changes: 5 additions & 5 deletions packages/create-docusaurus/templates/classic/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "docusaurus-2-classic-template",
"version": "3.6.1",
"version": "3.6.2",
"private": true,
"scripts": {
"docusaurus": "docusaurus",
Expand All @@ -14,17 +14,17 @@
"write-heading-ids": "docusaurus write-heading-ids"
},
"dependencies": {
"@docusaurus/core": "3.6.1",
"@docusaurus/preset-classic": "3.6.1",
"@docusaurus/core": "3.6.2",
"@docusaurus/preset-classic": "3.6.2",
"@mdx-js/react": "^3.0.0",
"clsx": "^2.0.0",
"prism-react-renderer": "^2.3.0",
"react": "^18.0.0",
"react-dom": "^18.0.0"
},
"devDependencies": {
"@docusaurus/module-type-aliases": "3.6.1",
"@docusaurus/types": "3.6.1"
"@docusaurus/module-type-aliases": "3.6.2",
"@docusaurus/types": "3.6.2"
},
"browserslist": {
"production": [
Expand Down
6 changes: 3 additions & 3 deletions packages/docusaurus-babel/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@docusaurus/babel",
"version": "3.6.1",
"version": "3.6.2",
"description": "Docusaurus package for Babel-related utils.",
"main": "./lib/index.js",
"types": "./lib/index.d.ts",
Expand Down Expand Up @@ -38,8 +38,8 @@
"@babel/runtime": "^7.25.9",
"@babel/runtime-corejs3": "^7.25.9",
"@babel/traverse": "^7.25.9",
"@docusaurus/logger": "3.6.1",
"@docusaurus/utils": "3.6.1",
"@docusaurus/logger": "3.6.2",
"@docusaurus/utils": "3.6.2",
"babel-plugin-dynamic-import-node": "^2.3.3",
"fs-extra": "^11.1.1",
"tslib": "^2.6.0"
Expand Down
14 changes: 7 additions & 7 deletions packages/docusaurus-bundler/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@docusaurus/bundler",
"version": "3.6.1",
"version": "3.6.2",
"description": "Docusaurus util package to abstract the current bundler.",
"main": "./lib/index.js",
"types": "./lib/index.d.ts",
Expand All @@ -19,12 +19,11 @@
"license": "MIT",
"dependencies": {
"@babel/core": "^7.25.9",
"@docusaurus/babel": "3.6.1",
"@docusaurus/cssnano-preset": "3.6.1",
"@docusaurus/logger": "3.6.1",
"@docusaurus/types": "3.6.1",
"@docusaurus/utils": "3.6.1",
"autoprefixer": "^10.4.14",
"@docusaurus/babel": "3.6.2",
"@docusaurus/cssnano-preset": "3.6.2",
"@docusaurus/logger": "3.6.2",
"@docusaurus/types": "3.6.2",
"@docusaurus/utils": "3.6.2",
"babel-loader": "^9.2.1",
"clean-css": "^5.3.2",
"copy-webpack-plugin": "^11.0.0",
Expand All @@ -37,6 +36,7 @@
"null-loader": "^4.0.1",
"postcss": "^8.4.26",
"postcss-loader": "^7.3.3",
"postcss-preset-env": "^10.1.0",
"react-dev-utils": "^12.0.1",
"terser-webpack-plugin": "^5.3.9",
"tslib": "^2.6.0",
Expand Down
Loading

0 comments on commit 3295d9d

Please sign in to comment.