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

Jump to bottom

[code-infra] Add missing @babel/runtime dependency to @mui/material-pigment-css #43473

Merged
merged 4 commits into from
Sep 3, 2024
Merged

[code-infra] Add missing @babel/runtime dependency to @mui/material-pigment-css #43473

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a327698
[code-infra] Add missing @babel/runtime
Janpot Aug 27, 2024
e34355a
Update build.mjs
Janpot Aug 27, 2024
fe0d766
Merge branch 'master' into babel-runtimed
Janpot Aug 27, 2024
97da18a
Update build.mjs
Janpot Aug 27, 2024
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
2 changes: 1 addition & 1 deletion babel.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ module.exports = function getBabelConfig(api) {
{
useESModules,
// any package needs to declare 7.25.0 as a runtime dependency. default is ^7.0.0
version: '^7.25.0',
version: process.env.MUI_BABEL_RUNTIME_VERSION || '^7.25.0',
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not 100% satisfied with this solution but the babel config is used both by our build and by babel-node. MUI_BABEL_RUNTIME_VERSION may not always be defined. This seemed to be the lesser of evils, the existence is already checked in the build script

},
],
[
Expand Down
1 change: 1 addition & 0 deletions packages/mui-material-pigment-css/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
"typescript:module-augmentation": "node scripts/testModuleAugmentation.js"
},
"dependencies": {
"@babel/runtime": "^7.25.0",
"@mui/system": "workspace:*",
"@pigment-css/react": "0.0.20"
},
Expand Down
3 changes: 3 additions & 0 deletions pnpm-lock.yaml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 12 additions & 0 deletions scripts/build.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import glob from 'fast-glob';
import path from 'path';
import { promisify } from 'util';
import yargs from 'yargs';
import * as fs from 'fs/promises';
import { getVersionEnvVariables, getWorkspaceRoot } from './utils.mjs';

const exec = promisify(childProcess.exec);
Expand All @@ -25,10 +26,21 @@ async function run(argv) {
);
}

const packageJsonPath = path.resolve('./package.json');
const packageJson = JSON.parse(await fs.readFile(packageJsonPath, { encoding: 'utf8' }));

const babelRuntimeVersion = packageJson.dependencies['@babel/runtime'];
if (!babelRuntimeVersion) {
throw new Error(
'package.json needs to have a dependency on `@babel/runtime` when building with `@babel/plugin-transform-runtime`.',
);
}

const env = {
NODE_ENV: 'production',
BABEL_ENV: bundle,
MUI_BUILD_VERBOSE: verbose,
MUI_BABEL_RUNTIME_VERSION: babelRuntimeVersion,
...(await getVersionEnvVariables()),
};

Expand Down