From 9ca8a1dbb5ae1c4029380e58435296ece040f94e Mon Sep 17 00:00:00 2001 From: Janpot <2109932+Janpot@users.noreply.github.com> Date: Fri, 3 Oct 2025 11:42:15 +0200 Subject: [PATCH 1/7] [code-infra] Support publishing to dist tag --- .github/workflows/publish.yml | 8 ++++++++ package.json | 2 +- pnpm-lock.yaml | 10 +++++----- scripts/README.md | 18 ++++++++++-------- 4 files changed, 24 insertions(+), 14 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 40f220ff20ab8c..1a63a4ec2855d5 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/package.json b/package.json index cc35c67cf1e055..4099a704dbd23a 100644 --- a/package.json +++ b/package.json @@ -111,7 +111,7 @@ "@mui-internal/api-docs-builder-core": "workspace:^", "@mui/internal-bundle-size-checker": "^1.0.9-canary.46", "@mui/internal-babel-plugin-minify-errors": "^2.0.8-canary.10", - "@mui/internal-code-infra": "^0.0.3-canary.18", + "@mui/internal-code-infra": "^0.0.3-canary.19", "@mui/internal-docs-utils": "workspace:^", "@mui/internal-scripts": "workspace:^", "@mui/internal-test-utils": "workspace:^", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index f028994fc2902a..34a613369aad6c 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -71,8 +71,8 @@ importers: specifier: ^1.0.9-canary.46 version: 1.0.9-canary.46(@types/node@20.19.17)(jiti@2.5.1)(lightningcss@1.30.1)(rollup@4.46.2)(terser@5.39.0)(tsx@4.20.4)(yaml@2.8.0) '@mui/internal-code-infra': - specifier: ^0.0.3-canary.18 - version: 0.0.3-canary.18(@typescript-eslint/parser@8.45.0(eslint@9.36.0(jiti@2.5.1))(typescript@5.9.2))(eslint-import-resolver-webpack@0.13.10)(eslint@9.36.0(jiti@2.5.1))(postcss@8.5.6)(prettier@3.6.2)(stylelint@16.23.1(typescript@5.9.2))(typescript@5.9.2) + specifier: ^0.0.3-canary.19 + version: 0.0.3-canary.19(@typescript-eslint/parser@8.45.0(eslint@9.36.0(jiti@2.5.1))(typescript@5.9.2))(eslint-import-resolver-webpack@0.13.10)(eslint@9.36.0(jiti@2.5.1))(postcss@8.5.6)(prettier@3.6.2)(stylelint@16.23.1(typescript@5.9.2))(typescript@5.9.2) '@mui/internal-docs-utils': specifier: workspace:^ version: link:packages-internal/docs-utils @@ -3995,8 +3995,8 @@ packages: resolution: {integrity: sha512-KyKMYVpN8ScUkhgmo6LwXoaVf5c49c2qNeX39s/xLALrmFycOqd2q+ElN6wXLrYT7VkgJQhMHj77PcKhoBpm4A==} hasBin: true - '@mui/internal-code-infra@0.0.3-canary.18': - resolution: {integrity: sha512-vsFbxE5LAfdxOy6r9um7hdBKGQPV1ehuRTczTeCngUGmcx+wUk4iIdhnVr5KGi5/wmoiNHYZrdWtq2AOVDXiHg==} + '@mui/internal-code-infra@0.0.3-canary.19': + resolution: {integrity: sha512-LMQAy+0XWTaXTbMtacB2QaQPqFhKwJnfIZ0k0yUBXdHizfKKAobJyifBS+YBErGNrkoW9GOMrJcuLM3h92gPcA==} hasBin: true peerDependencies: eslint: ^9.0.0 @@ -15974,7 +15974,7 @@ snapshots: - tsx - yaml - '@mui/internal-code-infra@0.0.3-canary.18(@typescript-eslint/parser@8.45.0(eslint@9.36.0(jiti@2.5.1))(typescript@5.9.2))(eslint-import-resolver-webpack@0.13.10)(eslint@9.36.0(jiti@2.5.1))(postcss@8.5.6)(prettier@3.6.2)(stylelint@16.23.1(typescript@5.9.2))(typescript@5.9.2)': + '@mui/internal-code-infra@0.0.3-canary.19(@typescript-eslint/parser@8.45.0(eslint@9.36.0(jiti@2.5.1))(typescript@5.9.2))(eslint-import-resolver-webpack@0.13.10)(eslint@9.36.0(jiti@2.5.1))(postcss@8.5.6)(prettier@3.6.2)(stylelint@16.23.1(typescript@5.9.2))(typescript@5.9.2)': dependencies: '@argos-ci/core': 4.1.5 '@babel/cli': 7.28.3(@babel/core@7.28.4) diff --git a/scripts/README.md b/scripts/README.md index 5244f3dc68ffa2..0b47b7e19d144b 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. From a12b2f4549b88416841c77dd8e23a8bc06f2251e Mon Sep 17 00:00:00 2001 From: Janpot <2109932+Janpot@users.noreply.github.com> Date: Fri, 3 Oct 2025 11:42:59 +0200 Subject: [PATCH 2/7] Update README.md --- scripts/README.md | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/scripts/README.md b/scripts/README.md index 0b47b7e19d144b..bed17696fe3575 100644 --- a/scripts/README.md +++ b/scripts/README.md @@ -38,11 +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. -> - **NPM dist tag to publish to** Use to publish legacy or canary versions. + > - **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. @@ -90,11 +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. -> - **NPM dist tag to publish to** Use to publish legacy or canary versions. + > - **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. From 36878ced163bfb20ac5ca61318f24018c46c01e0 Mon Sep 17 00:00:00 2001 From: Janpot <2109932+Janpot@users.noreply.github.com> Date: Fri, 3 Oct 2025 11:55:24 +0200 Subject: [PATCH 3/7] lowercase --- .github/workflows/publish.yml | 2 +- scripts/README.md | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 1a63a4ec2855d5..b36ffe0f221739 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -18,7 +18,7 @@ on: type: boolean default: true dist-tag: - description: 'NPM dist tag to publish to' + description: 'npm dist tag to publish to' required: false type: string default: 'latest' diff --git a/scripts/README.md b/scripts/README.md index bed17696fe3575..93d39c282861cc 100644 --- a/scripts/README.md +++ b/scripts/README.md @@ -42,7 +42,7 @@ The following steps must be proposed as a pull request. > - **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. + > - **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. @@ -94,7 +94,7 @@ Checkout the latest minor release tag and create a branch "release/PATCH_VERSION > - **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. + > - **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. From c1640de46e577cfb999aff4f902e6e17bbf72634 Mon Sep 17 00:00:00 2001 From: Janpot <2109932+Janpot@users.noreply.github.com> Date: Mon, 6 Oct 2025 17:25:50 +0200 Subject: [PATCH 4/7] Trigger Build From 1bc118ca5ea9e775e14fe248db1f4eadff99d8cb Mon Sep 17 00:00:00 2001 From: Janpot <2109932+Janpot@users.noreply.github.com> Date: Tue, 7 Oct 2025 15:52:07 +0200 Subject: [PATCH 5/7] Trigger Build From 66c134d076d63490c7f34ceaae43ab6de406c3de Mon Sep 17 00:00:00 2001 From: Janpot <2109932+Janpot@users.noreply.github.com> Date: Tue, 7 Oct 2025 16:28:11 +0200 Subject: [PATCH 6/7] bring back baseurl --- tsconfig.json | 1 + 1 file changed, 1 insertion(+) 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"], From a348ef0920ff2ab755166b3e6b4df9e0d58db20e Mon Sep 17 00:00:00 2001 From: Janpot <2109932+Janpot@users.noreply.github.com> Date: Tue, 7 Oct 2025 16:36:16 +0200 Subject: [PATCH 7/7] Update tsconfig.json --- docs/tsconfig.json | 2 -- 1 file changed, 2 deletions(-) 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,