Skip to content

Build: Add workaround resolution for Angular sandboxes #29690

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

Merged
merged 1 commit into from
Nov 22, 2024
Merged

Build: Add workaround resolution for Angular sandboxes #29690

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 3 additions & 0 deletions scripts/tasks/sandbox-parts.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,9 @@ export const install: Task['run'] = async ({ sandboxDir, key }, { link, dryRun,
'svelte-vite/default-ts',
'vue3-vite/default-js',
'vue3-vite/default-ts',
'angular-cli/15-ts',
'angular-cli/default-ts',
'angular-cli/prerelease',
];
if (sandboxesNeedingWorkarounds.includes(key)) {
await addWorkaroundResolutions({ cwd, dryRun, debug });
Expand Down
5 changes: 2 additions & 3 deletions scripts/utils/yarn.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ export const addPackageResolutions = async ({ cwd, dryRun }: YarnOptions) => {
packageJson.resolutions = {
...packageJson.resolutions,
...storybookVersions,
'enhanced-resolve': '~5.10.0', // TODO, remove this
// this is for our CI test, ensure we use the same version as docker image, it should match version specified in `./code/package.json` and `.circleci/config.yml`
'@swc/core': '1.5.7',
playwright: '1.48.1',
Expand Down Expand Up @@ -85,8 +84,8 @@ export const addWorkaroundResolutions = async ({ cwd, dryRun }: YarnOptions) =>
'@testing-library/dom': '^9.3.4',
'@testing-library/jest-dom': '^6.5.0',
'@testing-library/user-event': '^14.5.2',
// TODO: Remove as soon as @storybook/[email protected] is released
'@storybook/csf': '0.1.10--canary.d841bb4.0',
// TODO: Remove this once this issue is fixed https://github.com/thednp/position-observer/issues/1
'@thednp/shorty': '2.0.7',
};
await writeJSON(packageJsonPath, packageJson, { spaces: 2 });
};
Expand Down
Loading