diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 40f220ff20ab8c..b36ffe0f221739 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -17,6 +17,11 @@ on: required: false type: boolean default: true + dist-tag: + description: 'npm dist tag to publish to' + required: false + type: string + default: 'latest' permissions: {} @@ -48,5 +53,8 @@ jobs: if [ "${{ inputs.github-release }}" = "true" ]; then ARGS="$ARGS --github-release" fi + if [ -n "${{ inputs.dist-tag }}" ]; then + ARGS="$ARGS --tag ${{ inputs.dist-tag }}" + fi pnpm code-infra publish $ARGS diff --git a/docs/tsconfig.json b/docs/tsconfig.json index ce441d911c8339..932a49c817c815 100644 --- a/docs/tsconfig.json +++ b/docs/tsconfig.json @@ -4,8 +4,6 @@ "allowJs": true, "isolatedModules": true, "moduleResolution": "bundler", - /* files are emitted by babel */ - "baseUrl": "../", "noEmit": true, "noUnusedLocals": true, "resolveJsonModule": true, diff --git a/scripts/README.md b/scripts/README.md index 5244f3dc68ffa2..93d39c282861cc 100644 --- a/scripts/README.md +++ b/scripts/README.md @@ -38,10 +38,11 @@ The following steps must be proposed as a pull request. 1. Go to the [publish action](https://github.com/mui/material-ui/actions/workflows/publish.yml). 2. Choose "Run workflow" dropdown -> **Branch:** master -> **Commit SHA to release from:** the commit that contains the merged release on master. This commit is linked to the GitHub release. -> **Run in dry-run mode:** Used for debugging. -> **Create GitHub release:** Keep selected if you want a GitHub release to be automatically created from the changelog. + > - **Branch:** master + > - **Commit SHA to release from:** the commit that contains the merged release on master. This commit is linked to the GitHub release. + > - **Run in dry-run mode:** Used for debugging. + > - **Create GitHub release:** Keep selected if you want a GitHub release to be automatically created from the changelog. + > - **npm dist tag to publish to** Use to publish legacy or canary versions. 3. Click "Run workflow" 4. Refresh the page to see the newly created workflow, and click it. @@ -89,10 +90,11 @@ Checkout the latest minor release tag and create a branch "release/PATCH_VERSION 1. Go to the [publish action](https://github.com/mui/material-ui/actions/workflows/publish.yml). 2. Choose "Run workflow" dropdown -> **Branch:** master -> **Commit SHA to release from:** the commit that contains the merged release on master. This commit is linked to the GitHub release. -> **Run in dry-run mode:** Used for debugging. -> **Create GitHub release:** Keep selected if you want a GitHub release to be automatically created from the changelog. + > - **Branch:** master + > - **Commit SHA to release from:** the commit that contains the merged release on master. This commit is linked to the GitHub release. + > - **Run in dry-run mode:** Used for debugging. + > - **Create GitHub release:** Keep selected if you want a GitHub release to be automatically created from the changelog. + > - **npm dist tag to publish to** Use to publish legacy or canary versions. 3. Click "Run workflow" 4. Refresh the page to see the newly created workflow, and click it. diff --git a/tsconfig.json b/tsconfig.json index a23d5373799553..9c41a2f50d25c3 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -13,6 +13,7 @@ "allowSyntheticDefaultImports": true, "noErrorTruncation": false, "allowJs": true, + "baseUrl": ".", "paths": { "@mui/material": ["./packages/mui-material/src"], "@mui/material/package.json": ["./packages/mui-material/package.json"],