Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[code-infra] Fix types for @mui/styled-engine #45413

Merged
merged 2 commits into from
Feb 26, 2025
Merged

[code-infra] Fix types for @mui/styled-engine #45413

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
207d8b4
fix types for @mui/styled-engine
Janpot Feb 25, 2025
9358aaa
Merge branch 'master' into fix-styled-engine-types
Janpot Feb 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion packages/mui-private-theming/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,12 @@
"url": "https://opencollective.com/mui-org"
},
"scripts": {
"build": "pnpm build:modern && pnpm build:node && pnpm build:stable && pnpm build:copy-files",
"build": "pnpm build:modern && pnpm build:node && pnpm build:stable && pnpm build:types && pnpm build:copy-files",
"build:modern": "node ../../scripts/build.mjs modern",
"build:node": "node ../../scripts/build.mjs node",
"build:stable": "node ../../scripts/build.mjs stable",
"build:copy-files": "node ../../scripts/copyFiles.mjs",
"build:types": "tsx ../../scripts/buildTypes.mts --skipTsc",
"prebuild": "rimraf build",
"release": "pnpm build && pnpm publish",
"test": "cd ../../ && cross-env NODE_ENV=test mocha 'packages/mui-private-theming/**/*.test.?(c|m)[jt]s?(x)'",
Expand Down
1 change: 1 addition & 0 deletions packages/mui-private-theming/src/defaultTheme/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export {};
3 changes: 2 additions & 1 deletion packages/mui-styled-engine-sc/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,12 @@
"url": "https://opencollective.com/mui-org"
},
"scripts": {
"build": "pnpm build:modern && pnpm build:node && pnpm build:stable && pnpm build:copy-files",
"build": "pnpm build:modern && pnpm build:node && pnpm build:stable && pnpm build:types && pnpm build:copy-files",
"build:modern": "node ../../scripts/build.mjs modern",
"build:node": "node ../../scripts/build.mjs node",
"build:stable": "node ../../scripts/build.mjs stable",
"build:copy-files": "node ../../scripts/copyFiles.mjs",
"build:types": "tsx ../../scripts/buildTypes.mts --skipTsc",
"prebuild": "rimraf build",
"release": "pnpm build && pnpm publish",
"test": "cd ../../ && cross-env NODE_ENV=test mocha 'packages/mui-styled-engine-sc/**/*.test.?(c|m)[jt]s?(x)'",
Expand Down
3 changes: 2 additions & 1 deletion packages/mui-styled-engine/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,12 @@
"url": "https://opencollective.com/mui-org"
},
"scripts": {
"build": "pnpm build:modern && pnpm build:node && pnpm build:stable && pnpm build:copy-files",
"build": "pnpm build:modern && pnpm build:node && pnpm build:stable && pnpm build:types && pnpm build:copy-files",
"build:modern": "node ../../scripts/build.mjs modern",
"build:node": "node ../../scripts/build.mjs node",
"build:stable": "node ../../scripts/build.mjs stable",
"build:copy-files": "node ../../scripts/copyFiles.mjs",
"build:types": "tsx ../../scripts/buildTypes.mts --skipTsc",
"prebuild": "rimraf build",
"release": "pnpm build && pnpm publish",
"test": "cd ../../ && cross-env NODE_ENV=test mocha 'packages/mui-styled-engine/**/*.test.?(c|m)[jt]s?(x)'",
Expand Down
3 changes: 2 additions & 1 deletion packages/mui-styles/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,12 @@
"url": "https://opencollective.com/mui-org"
},
"scripts": {
"build": "pnpm build:modern && pnpm build:node && pnpm build:stable && pnpm build:copy-files",
"build": "pnpm build:modern && pnpm build:node && pnpm build:stable && pnpm build:types && pnpm build:copy-files",
"build:modern": "node ../../scripts/build.mjs modern",
"build:node": "node ../../scripts/build.mjs node",
"build:stable": "node ../../scripts/build.mjs stable",
"build:copy-files": "node ../../scripts/copyFiles.mjs",
"build:types": "tsx ../../scripts/buildTypes.mts --skipTsc",
"prebuild": "rimraf build",
"release": "pnpm build && pnpm publish",
"test": "cd ../../ && cross-env NODE_ENV=test mocha 'packages/mui-styles/**/*.test.?(c|m)[jt]s?(x)'",
Expand Down
Empty file added packages/mui-styles/src/defaultTheme/index.js
View file
Open in desktop
Empty file.
47 changes: 31 additions & 16 deletions scripts/buildTypes.mts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,29 +54,37 @@ async function copyDeclarations(sourceDirectory: string, destinationDirectory: s
});
}

async function main() {
const packageRoot = process.cwd();
interface HandlerArgv {
skipTsc: boolean;
}

const tsconfigPath = path.join(packageRoot, 'tsconfig.build.json');
const tsconfigExists = await fs.access(tsconfigPath).then(
() => true,
() => false,
);
if (!tsconfigExists) {
throw new Error(
'Unable to find a tsconfig to build this project. ' +
`The package root needs to contain a 'tsconfig.build.json'. ` +
`The package root is '${packageRoot}'`,
);
}
async function main(argv: HandlerArgv) {
const packageRoot = process.cwd();

const srcPath = path.join(packageRoot, 'src');
const buildFolder = path.join(packageRoot, 'build');
const esmFolder = path.join(buildFolder, 'esm');
const modernFolder = path.join(buildFolder, 'modern');

await typescriptCopy({ from: srcPath, to: esmFolder });
await emitDeclarations(tsconfigPath, esmFolder);

if (!argv.skipTsc) {
const tsconfigPath = path.join(packageRoot, 'tsconfig.build.json');
const tsconfigExists = await fs.access(tsconfigPath).then(
() => true,
() => false,
);

if (!tsconfigExists) {
throw new Error(
'Unable to find a tsconfig to build this project. ' +
`The package root needs to contain a 'tsconfig.build.json'. ` +
`The package root is '${packageRoot}'`,
);
}

await emitDeclarations(tsconfigPath, esmFolder);
}

await addImportExtensions(esmFolder);

Expand All @@ -85,10 +93,17 @@ async function main() {
}

yargs(process.argv.slice(2))
.command({
.command<HandlerArgv>({
command: '$0',
description:
'Builds a project with a fix for https://github.com/microsoft/TypeScript/issues/39117',
builder: (command) => {
return command.option('skipTsc', {
type: 'boolean',
default: false,
describe: 'Set to `true` if you want the legacy behavior of just copying .d.ts files.',
});
},
handler: main,
})
.help()
Expand Down