Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
4 changes: 4 additions & 0 deletions code/lib/cli-storybook/src/sandbox-templates.ts
Original file line number Diff line number Diff line change
Expand Up @@ -584,6 +584,10 @@ export const baseTemplates = {
name: 'Angular CLI Prerelease (Webpack | TypeScript)',
script:
'npx -p @angular/cli@next ng new angular-v16 --directory {{beforeDir}} --routing=true --minimal=true --style=scss --strict --skip-git --skip-install --package-manager=yarn --ssr',
modifications: {
// Angular 21 has introduced a peer dependency requirement on standard-schema via @angular/forms`
extraDependencies: ['@standard-schema/spec@^1'],
},
expected: {
framework: '@storybook/angular',
renderer: '@storybook/angular',
Expand Down
16 changes: 13 additions & 3 deletions code/lib/create-storybook/src/generators/ANGULAR/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import { AngularJSON, ProjectType, copyTemplate } from 'storybook/internal/cli';
import { logger, prompt } from 'storybook/internal/node-logger';
import { SupportedBuilder, SupportedFramework, SupportedRenderer } from 'storybook/internal/types';

import semver from 'semver';
import { dedent } from 'ts-dedent';

import { defineGeneratorModule } from '../modules/GeneratorModule';
Expand Down Expand Up @@ -85,11 +86,20 @@ export default defineGeneratorModule({
copyTemplate(templateDir, root || undefined);
}

const extraAngularDeps = [
angularVersion
? `@angular-devkit/build-angular@${angularVersion}`
: '@angular-devkit/build-angular',
angularVersion ? `@angular-devkit/architect@${angularVersion}` : '@angular-devkit/architect',
angularVersion ? `@angular-devkit/core@${angularVersion}` : '@angular-devkit/core',
angularVersion
? `@angular/platform-browser-dynamic@${angularVersion}`
: '@angular/platform-browser-dynamic',
];

return {
extraPackages: [
angularVersion
? `@angular-devkit/build-angular@${angularVersion}`
: '@angular-devkit/build-angular',
...extraAngularDeps,
...(useCompodoc ? ['@compodoc/compodoc', '@storybook/addon-docs'] : []),
],
addScripts: false, // Handled above based on project count
Expand Down