Merge pull request #30790 from storybookjs/kasper/fix-prerelease

Angular: Add @angular-devkit/build-angular to default installed pacakages in angular

Author: kasperpeulen

code/core/src/common/js-package-manager/JsPackageManager.test.ts

@@ -43,12 +43,12 @@ describe('JsPackageManager', () => {
       expect(result).toEqual(['@storybook/[email protected]']);
     });
 
-    it('should return the latest stable release version when there is no current version', async () => {
+    it('should get the requested version when the package is not in the monorepo', async () => {
       mockLatestVersion.mockResolvedValue('2.0.0');
 
-      const result = await jsPackageManager.getVersionedPackages(['@storybook/new-addon@^8.3.0']);
+      const result = await jsPackageManager.getVersionedPackages(['@storybook/new-addon@^next']);
 
-      expect(result).toEqual(['@storybook/new-addon@^2.0.0']);
+      expect(result).toEqual(['@storybook/new-addon@^next']);
     });
   });
 });

code/core/src/common/js-package-manager/JsPackageManager.ts

@@ -333,6 +333,13 @@ export abstract class JsPackageManager {
     return Promise.all(
       packages.map(async (pkg) => {
         const [packageName, packageVersion] = getPackageDetails(pkg);
+
+        // If the packageVersion is specified and we are not dealing with a storybook package,
+        // just return the requested version.
+        if (packageVersion && !(packageName in storybookPackagesVersions)) {
+          return pkg;
+        }
+
         const latestInRange = await this.latestVersion(packageName, packageVersion);
 
         const k = packageName as keyof typeof storybookPackagesVersions;

code/lib/cli-storybook/src/sandbox-templates.ts

@@ -499,6 +499,9 @@ export const baseTemplates = {
       renderer: '@storybook/angular',
       builder: '@storybook/builder-webpack5',
     },
+    modifications: {
+      extraDependencies: ['@angular-devkit/build-angular@next'],
+    },
     skipTasks: ['e2e-tests-dev', 'bench', 'vitest-integration'],
   },
   'angular-cli/default-ts': {

code/lib/create-storybook/src/generators/ANGULAR/index.ts

@@ -73,7 +73,10 @@ const generator: Generator<{ projectName: string }> = async (
     'angular',
     {
       extraAddons: [`@storybook/addon-onboarding`],
-      ...(useCompodoc && { extraPackages: ['@compodoc/compodoc', '@storybook/addon-docs'] }),
+      extraPackages: [
+        '@angular-devkit/build-angular',
+        ...(useCompodoc ? ['@compodoc/compodoc', '@storybook/addon-docs'] : []),
+      ],
       addScripts: false,
       componentsDestinationPath: root ? `${root}/src/stories` : undefined,
       storybookConfigFolder: storybookFolder,