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

Revert cra-template workaround #21550

Merged
merged 2 commits into from
Feb 3, 2022
Merged

Revert cra-template workaround #21550

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
9d2951c
Revert "cra-template: temporarily add resolution for babel to work ar…
ecraig12345 Feb 3, 2022
03ed517
Change files
ecraig12345 Feb 3, 2022
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 ...a130326a-e7ca-434d-bb78-5c568d837747.json → ...f19ad23e-0c38-418c-b102-834d12de9304.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"type": "patch",
"comment": "Temporarily add resolution for `@babel/core` to work around bug",
"comment": "Revert adding resolution for babel because bug is fixed",
Copy link
Member Author

Choose a reason for hiding this comment

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

Note, this is appearing as a rename because it's deleting the old change file and adding a new one. If this goes in before the publish build, the change type here can be changed to none.

"packageName": "@fluentui/cra-template",
"email": "elcraig@microsoft.com",
"dependentChangeType": "patch"
Expand Down
3 changes: 0 additions & 3 deletions packages/cra-template/template.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,6 @@
"typescript": "^4.1.2",
"web-vitals": "^1.0.1"
},
"resolutions": {
"@babel/core": "7.16.12"
},
"eslintConfig": {
"extends": ["react-app", "react-app/jest"]
}
Expand Down
8 changes: 0 additions & 8 deletions packages/fluentui/projects-test/src/createReactApp.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,14 +30,6 @@ export async function createReactApp() {

await prepareCreateReactApp(tempPaths, 'typescript');
const testAppPath = config.paths.withRootAt(tempPaths.testApp);

// TODO: remove once babel issue is fixed (tracked by https://github.com/microsoft/fluentui/issues/21546)
logger('Add resolution to work around @babel/core issue');
const packageJson = fs.readJSONSync(testAppPath('package.json'));
packageJson.resolutions = { '@babel/core': '7.16.12' };
fs.writeJSONSync(testAppPath('package.json'), packageJson, { spaces: 2 });
await shEcho('yarn', testAppPath());

logger(`Test React project is successfully created: ${testAppPath()}`);

logger('STEP 2. Add Fluent UI dependency to test project..');
Expand Down