Skip to content

Commit d42a01c

Browse files
committed
[code-infra] Move away from monorepo dependency
Use the latest code-infra and docs-infra packages to move away from adding @mui/monorepo as a dependency. Related: mui/mui-public#812
1 parent aae1cd5 commit d42a01c

File tree

10 files changed

+234
-2060
lines changed

10 files changed

+234
-2060
lines changed

.circleci/config.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ jobs:
201201
NODE_OPTIONS: --max-old-space-size=3072
202202
- run:
203203
name: Any defect declaration files?
204-
command: node scripts/testBuiltTypes.mjs
204+
command: pnpm code-infra validate-built-types
205205
- save_cache:
206206
name: Save generated declaration files
207207
key: typescript-declaration-files-{{ .Branch }}-{{ .Revision }}
@@ -237,7 +237,7 @@ jobs:
237237
# Fixing these takes some effort that isn't viable to merge in a single PR.
238238
# We'll simply monitor them for now.
239239
set +e
240-
node scripts/testBuiltTypes.mjs
240+
pnpm code-infra validate-built-types
241241
exit 0
242242
test_browser:
243243
<<: *default-job
@@ -303,7 +303,7 @@ jobs:
303303
command: pnpm release:build
304304
- run:
305305
name: Validate type declarations
306-
command: pnpm validate-declarations
306+
command: pnpm code-infra validate-built-types
307307
- run:
308308
name: Check public types
309309
command: pnpm -r run release:test

docs/next.config.mjs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
import * as path from 'path';
33
import * as url from 'url';
44
import * as fs from 'fs';
5-
import withDocsInfra from '@mui/monorepo/docs/nextConfigDocsInfra.js';
5+
import { withDeploymentConfig } from '@mui/internal-docs-infra/withDocsInfra';
66
import nextMdx from '@next/mdx';
77
import rehypeExtractToc from '@stefanprobst/rehype-extract-toc';
88
import remarkGfm from 'remark-gfm';
@@ -59,7 +59,7 @@ const nextConfig = {
5959
devIndicators: false,
6060
};
6161

62-
const mergedConfig = withMdx(withDocsInfra(nextConfig));
62+
const mergedConfig = withMdx(withDeploymentConfig(nextConfig));
6363

6464
if (!process.env.CI) {
6565
delete mergedConfig.experimental?.cpus;

docs/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@
6262
},
6363
"devDependencies": {
6464
"@mdx-js/mdx": "^3.1.1",
65+
"@mui/internal-docs-infra": "^0.2.3-canary.5",
6566
"@mui/internal-docs-utils": "^2.0.1",
6667
"@mui/internal-scripts": "^2.0.10",
6768
"@mui/internal-test-utils": "^2.0.10",

docs/types.d.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
/// <reference types="gtag.js" />
22

33
declare module 'gtag.js';
4-
declare module '@mui/monorepo/docs/nextConfigDocsInfra.js';
54

65
declare module '*.mdx' {
76
const MDXComponent: (props) => JSX.Element;

package.json

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
"release:changelog": "tsx scripts/releaseChangelog.mts",
1212
"release:publish": "pnpm publish --recursive --tag latest",
1313
"release:publish:dry-run": "pnpm publish --recursive --tag latest --registry=\"http://localhost:4873/\"",
14-
"release:tag": "node scripts/releaseTag.mjs --repo base-ui",
1514
"docs:api": "pnpm --filter api-docs-builder start",
1615
"docs:build": "pnpm --filter docs generate-llms && pnpm --filter docs build",
1716
"docs:deploy": "pnpm --filter docs run deploy",
@@ -54,17 +53,15 @@
5453
"test:browsers": "cross-env VITEST_ENV=all-browsers pnpm test:_unit",
5554
"test:argos": "code-infra argos-push --folder test/regressions/screenshots/chrome",
5655
"typescript": "tsc -b tsconfig.json",
57-
"validate-declarations": "tsx scripts/validateTypescriptDeclarations.mts",
5856
"inline-scripts": "tsx ./scripts/inlineScripts.mts"
5957
},
6058
"devDependencies": {
6159
"@arethetypeswrong/cli": "^0.18.2",
6260
"@babel/plugin-transform-react-constant-elements": "^7.27.1",
6361
"@base-ui-components/monorepo-tests": "workspace:*",
64-
"@mui/internal-code-infra": "^0.0.3-canary.26",
62+
"@mui/internal-code-infra": "^0.0.3-canary.34",
6563
"@mui/internal-netlify-cache": "^0.0.2-canary.0",
6664
"@mui/internal-test-utils": "^2.0.10",
67-
"@mui/monorepo": "github:mui/material-ui#v7.3.2",
6865
"@octokit/rest": "^22.0.0",
6966
"@playwright/test": "1.56.0",
7067
"@tailwindcss/postcss": "4.1.14",

0 commit comments

Comments
 (0)