From 541950961afdebc101fadb4743abd5493d7bcbba Mon Sep 17 00:00:00 2001 From: Yann Braga Date: Sat, 23 Nov 2024 01:06:07 +0100 Subject: [PATCH 1/2] Revert "Build: Add workaround resolution for Angular sandboxes" --- scripts/tasks/sandbox-parts.ts | 3 --- scripts/utils/yarn.ts | 5 +++-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/scripts/tasks/sandbox-parts.ts b/scripts/tasks/sandbox-parts.ts index 1adb524aa12..4f8dd85ecc4 100644 --- a/scripts/tasks/sandbox-parts.ts +++ b/scripts/tasks/sandbox-parts.ts @@ -109,9 +109,6 @@ 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 }); diff --git a/scripts/utils/yarn.ts b/scripts/utils/yarn.ts index 9e14f6ad9dc..1b04f358155 100644 --- a/scripts/utils/yarn.ts +++ b/scripts/utils/yarn.ts @@ -29,6 +29,7 @@ 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', @@ -84,8 +85,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 this once this issue is fixed https://github.com/thednp/position-observer/issues/1 - '@thednp/shorty': '2.0.7', + // TODO: Remove as soon as @storybook/csf@0.1.10 is released + '@storybook/csf': '0.1.10--canary.d841bb4.0', }; await writeJSON(packageJsonPath, packageJson, { spaces: 2 }); }; From b95adad91f20dc57ea1f563f0e8883b8420b065d Mon Sep 17 00:00:00 2001 From: Yann Braga Date: Sat, 23 Nov 2024 01:08:54 +0100 Subject: [PATCH 2/2] Apply suggestions from code review --- scripts/utils/yarn.ts | 3 --- 1 file changed, 3 deletions(-) diff --git a/scripts/utils/yarn.ts b/scripts/utils/yarn.ts index 1b04f358155..6272134a755 100644 --- a/scripts/utils/yarn.ts +++ b/scripts/utils/yarn.ts @@ -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', @@ -85,8 +84,6 @@ 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/csf@0.1.10 is released - '@storybook/csf': '0.1.10--canary.d841bb4.0', }; await writeJSON(packageJsonPath, packageJson, { spaces: 2 }); };