Angular: Bundle using TSup

code/frameworks/angular/builders.json

@@ -0,0 +1,14 @@
+{
+  "builders": {
+    "build-storybook": {
+      "implementation": "./dist/builders/build-storybook",
+      "schema": "./build-schema.json",
+      "description": "Build storybook"
+    },
+    "start-storybook": {
+      "implementation": "./dist/builders/start-storybook",
+      "schema": "./start-schema.json",
+      "description": "Start storybook"
+    }
+  }
+}

code/frameworks/angular/package.json

@@ -27,6 +27,23 @@
       "require": "./dist/index.js"
     },
     "./preset": "./preset.js",
+    "./server/framework-preset-angular-ivy": "./server/framework-preset-angular-ivy.js",
+    "./server/framework-preset-angular-cli": "./server/framework-preset-angular-cli.js",
+    "./client/config": {
+      "types": "./dist/client/config.d.ts",
+      "import": "./dist/client/config.mjs",
+      "require": "./dist/client/config.js"
+    },
+    "./client/preview-prod": {
+      "types": "./dist/client/preview-prod.d.ts",
+      "import": "./dist/client/preview-prod.mjs",
+      "require": "./dist/client/preview-prod.js"
+    },
+    "./client/docs/config": {
+      "types": "./dist/client/docs/config.d.ts",
+      "import": "./dist/client/docs/config.mjs",
+      "require": "./dist/client/docs/config.js"
+    },
     "./node": {
       "types": "./dist/node/index.d.ts",
       "import": "./dist/node/index.js",
@@ -38,7 +55,26 @@
   "main": "dist/index.js",
   "module": "dist/index.mjs",
   "types": "dist/index.d.ts",
+  "typesVersions": {
+    "*": {
+      "*": [
+        "dist/index.d.ts"
+      ],
+      "client/config": [
+        "dist/client/config.d.ts"
+      ],
+      "client/preview-prod": [
+        "dist/client/preview-prod.d.ts"
+      ],
+      "client/docs/config": [
+        "dist/client/docs/config.d.ts"
+      ]
+    }
+  },
   "files": [
+    "builders.json",
+    "build-schema.json",
+    "start-schema.json",
     "dist/**/*",
     "template/cli/**/*",
     "README.md",
@@ -48,16 +84,12 @@
     "!src/**/*"
   ],
   "scripts": {
-    "check": "yarn run -T tsc",
-    "prep": "rimraf dist && jiti ../../../scripts/prepare/tsc.ts"
+    "check": "jiti ../../../scripts/prepare/check.ts",
+    "prep": "jiti ../../../scripts/prepare/addon-bundle.ts"
   },
   "dependencies": {
     "@storybook/builder-webpack5": "workspace:*",
-    "@storybook/core-webpack": "workspace:*",
     "@storybook/global": "^5.0.0",
-    "@types/webpack-env": "^1.18.0",
-    "fd-package-json": "^1.2.0",
-    "find-up": "^7.0.0",
     "telejson": "8.0.0",
     "ts-dedent": "^2.0.0",
     "tsconfig-paths-webpack-plugin": "^4.0.1",
@@ -76,7 +108,10 @@
     "@angular/forms": "^19.1.1",
     "@angular/platform-browser": "^19.1.1",
     "@angular/platform-browser-dynamic": "^19.1.1",
+    "@storybook/core-webpack": "workspace:*",
     "@types/node": "^22.0.0",
+    "fd-package-json": "^1.2.0",
+    "find-up": "^7.0.0",
     "rimraf": "^6.0.1",
     "typescript": "^5.8.3",
     "webpack": "5",
@@ -117,10 +152,22 @@
   "publishConfig": {
     "access": "public"
   },
-  "builders": "dist/builders/builders.json",
+  "builders": "builders.json",
   "bundler": {
-    "post": "./scripts/postbuild.js",
-    "tsConfig": "tsconfig.build.json"
+    "previewEntries": [
+      "./src/index.ts",
+      "./src/client/index.ts",
+      "./src/client/config.ts",
+      "./src/client/preview-prod.ts",
+      "./src/client/docs/config.ts"
+    ],
+    "nodeEntries": [
+      "./src/preset.ts",
+      "./src/server/framework-preset-angular-ivy.ts",
+      "./src/server/framework-preset-angular-cli.ts",
+      "./src/builders/start-storybook/index.ts",
+      "./src/builders/build-storybook/index.ts"
+    ]
   },
   "gitHead": "e6a7fd8a655c69780bc20b9749c2699e44beae16"
 }

code/frameworks/angular/src/builders/build-storybook/index.ts

@@ -1,33 +1,35 @@
 import { getEnvConfig, getProjectRoot, versions } from 'storybook/internal/common';
 import { buildStaticStandalone, withTelemetry } from 'storybook/internal/core-server';
 import { addToGlobalContext } from 'storybook/internal/telemetry';
-import { CLIOptions } from 'storybook/internal/types';
+import type { CLIOptions } from 'storybook/internal/types';
 
-import {
+import type {
   BuilderContext,
   BuilderHandlerFn,
   BuilderOutput,
   BuilderOutputLike,
   Target,
-  createBuilder,
-  targetFromTargetString,
   Builder as DevkitBuilder,
 } from '@angular-devkit/architect';
-import { BrowserBuilderOptions, StylePreprocessorOptions } from '@angular-devkit/build-angular';
-import {
+import { createBuilder, targetFromTargetString } from '@angular-devkit/architect';
+import type {
+  BrowserBuilderOptions,
+  StylePreprocessorOptions,
+} from '@angular-devkit/build-angular';
+import type {
   AssetPattern,
   SourceMapUnion,
   StyleElement,
 } from '@angular-devkit/build-angular/src/builders/browser/schema';
-import { JsonObject } from '@angular-devkit/core';
+import type { JsonObject } from '@angular-devkit/core';
 import { findPackageSync } from 'fd-package-json';
 import { findUpSync } from 'find-up';
 import { from, of, throwError } from 'rxjs';
 import { catchError, map, mapTo, switchMap } from 'rxjs/operators';
 
 import { errorSummary, printErrorDetails } from '../utils/error-handler';
 import { runCompodoc } from '../utils/run-compodoc';
-import { StandaloneOptions } from '../utils/standalone-options';
+import type { StandaloneOptions } from '../utils/standalone-options';
 
 addToGlobalContext('cliVersion', versions.storybook);
 

code/frameworks/angular/src/builders/start-storybook/index.ts

@@ -1,32 +1,34 @@
 import { getEnvConfig, getProjectRoot, versions } from 'storybook/internal/common';
 import { buildDevStandalone, withTelemetry } from 'storybook/internal/core-server';
 import { addToGlobalContext } from 'storybook/internal/telemetry';
-import { CLIOptions } from 'storybook/internal/types';
+import type { CLIOptions } from 'storybook/internal/types';
 
-import {
+import type {
   BuilderContext,
   BuilderHandlerFn,
   BuilderOutput,
   Target,
-  createBuilder,
-  targetFromTargetString,
   Builder as DevkitBuilder,
 } from '@angular-devkit/architect';
-import { BrowserBuilderOptions, StylePreprocessorOptions } from '@angular-devkit/build-angular';
-import {
+import { createBuilder, targetFromTargetString } from '@angular-devkit/architect';
+import type {
+  BrowserBuilderOptions,
+  StylePreprocessorOptions,
+} from '@angular-devkit/build-angular';
+import type {
   AssetPattern,
   SourceMapUnion,
   StyleElement,
 } from '@angular-devkit/build-angular/src/builders/browser/schema';
-import { JsonObject } from '@angular-devkit/core';
+import type { JsonObject } from '@angular-devkit/core';
 import { findPackageSync } from 'fd-package-json';
 import { findUpSync } from 'find-up';
 import { Observable, from, of } from 'rxjs';
 import { map, mapTo, switchMap } from 'rxjs/operators';
 
 import { errorSummary, printErrorDetails } from '../utils/error-handler';
 import { runCompodoc } from '../utils/run-compodoc';
-import { StandaloneOptions } from '../utils/standalone-options';
+import type { StandaloneOptions } from '../utils/standalone-options';
 
 addToGlobalContext('cliVersion', versions.storybook);
 

code/frameworks/angular/src/builders/utils/run-compodoc.spec.ts

@@ -1,6 +1,6 @@
-import { BuilderContext } from '@angular-devkit/architect';
+import type { BuilderContext } from '@angular-devkit/architect';
 // @ts-expect-error (TODO)
-import { LoggerApi } from '@angular-devkit/core/src/logger';
+import type { LoggerApi } from '@angular-devkit/core/src/logger';
 import { take } from 'rxjs/operators';
 import { afterEach, describe, expect, it, vi } from 'vitest';
 

code/frameworks/angular/src/builders/utils/run-compodoc.ts

@@ -2,7 +2,7 @@ import { isAbsolute, relative } from 'node:path';
 
 import { JsPackageManagerFactory } from 'storybook/internal/common';
 
-import { BuilderContext } from '@angular-devkit/architect';
+import type { BuilderContext } from '@angular-devkit/architect';
 import { Observable } from 'rxjs';
 
 const hasTsConfigArg = (args: string[]) => args.indexOf('-p') !== -1;

code/frameworks/angular/src/builders/utils/standalone-options.ts

@@ -1,7 +1,7 @@
-import { BuilderOptions, CLIOptions, LoadOptions } from 'storybook/internal/types';
+import type { BuilderOptions, CLIOptions, LoadOptions } from 'storybook/internal/types';
 
-import { BuilderContext } from '@angular-devkit/architect';
-import {
+import type { BuilderContext } from '@angular-devkit/architect';
+import type {
   AssetPattern,
   SourceMapUnion,
   StyleElement,

code/frameworks/angular/src/client/angular-beta/AbstractRenderer.ts

@@ -1,9 +1,10 @@
-import { ApplicationRef, NgModule } from '@angular/core';
+import type { ApplicationRef, NgModule } from '@angular/core';
 import { bootstrapApplication } from '@angular/platform-browser';
-import { BehaviorSubject, Subject } from 'rxjs';
+import type { Subject } from 'rxjs';
+import { BehaviorSubject } from 'rxjs';
 import { stringify } from 'telejson';
 
-import { ICollection, StoryFnAngularReturnType } from '../types';
+import type { ICollection, StoryFnAngularReturnType } from '../types';
 import { getApplication } from './StorybookModule';
 import { storyPropsProvider } from './StorybookProvider';
 import { queueBootstrapping } from './utils/BootstrapQueue';

code/frameworks/angular/src/client/angular-beta/CanvasRenderer.ts

@@ -1,4 +1,4 @@
-import { Parameters, StoryFnAngularReturnType } from '../types';
+import type { Parameters, StoryFnAngularReturnType } from '../types';
 import { AbstractRenderer } from './AbstractRenderer';
 
 export class CanvasRenderer extends AbstractRenderer {

code/frameworks/angular/src/client/angular-beta/ComputesTemplateFromComponent.test.ts

@@ -1,11 +1,12 @@
 import { Component } from '@angular/core';
-import { ArgTypes } from 'storybook/internal/types';
+import type { ArgTypes } from 'storybook/internal/types';
 import { describe, it, expect } from 'vitest';
 import {
   computesTemplateFromComponent,
   computesTemplateSourceFromComponent,
 } from './ComputesTemplateFromComponent';
-import { ISomeInterface, ButtonAccent, InputComponent } from './__testfixtures__/input.component';
+import type { ISomeInterface } from './__testfixtures__/input.component';
+import { ButtonAccent, InputComponent } from './__testfixtures__/input.component';
 
 describe('angular template decorator', () => {
   it('with props should generate tag with properties', () => {

code/frameworks/angular/src/client/angular-beta/ComputesTemplateFromComponent.ts

@@ -1,10 +1,10 @@
-import { ArgTypes } from 'storybook/internal/types';
+import type { ArgTypes } from 'storybook/internal/types';
 
-import { Type } from '@angular/core';
+import type { Type } from '@angular/core';
 
-import { ICollection } from '../types';
+import type { ICollection } from '../types';
+import type { ComponentInputsOutputs } from './utils/NgComponentAnalyzer';
 import {
-  ComponentInputsOutputs,
   getComponentDecoratorMetadata,
   getComponentInputsOutputs,
 } from './utils/NgComponentAnalyzer';

code/frameworks/angular/src/client/angular-beta/DocsRenderer.ts

@@ -1,7 +1,7 @@
 import { DOCS_RENDERED, STORY_CHANGED } from 'storybook/internal/core-events';
 import { addons } from 'storybook/preview-api';
 
-import { Parameters, StoryFnAngularReturnType } from '../types';
+import type { Parameters, StoryFnAngularReturnType } from '../types';
 import { AbstractRenderer, STORY_UID_ATTRIBUTE } from './AbstractRenderer';
 import { getNextStoryUID } from './utils/StoryUID';
 

code/frameworks/angular/src/client/angular-beta/StorybookModule.test.ts

@@ -1,11 +1,12 @@
 // @vitest-environment happy-dom
 
-import { NgModule, Component, EventEmitter, Input, Output } from '@angular/core';
+import type { NgModule } from '@angular/core';
+import { Component, EventEmitter, Input, Output } from '@angular/core';
 import { describe, expect, it } from 'vitest';
 
 import { TestBed } from '@angular/core/testing';
 import { BehaviorSubject } from 'rxjs';
-import { ICollection } from '../types';
+import type { ICollection } from '../types';
 import { getApplication } from './StorybookModule';
 import { storyPropsProvider } from './StorybookProvider';
 import { PropertyExtractor } from './utils/PropertyExtractor';

code/frameworks/angular/src/client/angular-beta/StorybookModule.ts

@@ -1,7 +1,7 @@
-import { StoryFnAngularReturnType } from '../types';
+import type { StoryFnAngularReturnType } from '../types';
 import { computesTemplateFromComponent } from './ComputesTemplateFromComponent';
 import { createStorybookWrapperComponent } from './StorybookWrapperComponent';
-import { PropertyExtractor } from './utils/PropertyExtractor';
+import type { PropertyExtractor } from './utils/PropertyExtractor';
 
 export const getApplication = ({
   storyFnAngular,

code/frameworks/angular/src/client/angular-beta/StorybookProvider.ts

@@ -1,7 +1,9 @@
-import { InjectionToken, NgZone, Provider } from '@angular/core';
-import { Observable, Subject, Subscriber } from 'rxjs';
+import type { Provider } from '@angular/core';
+import { InjectionToken, NgZone } from '@angular/core';
+import type { Subject, Subscriber } from 'rxjs';
+import { Observable } from 'rxjs';
 
-import { ICollection } from '../types';
+import type { ICollection } from '../types';
 
 export const STORY_PROPS = new InjectionToken<Subject<ICollection | undefined>>('STORY_PROPS');