Do not split type and value imports in Angular

Author: IanVS

code/frameworks/angular/.eslintrc.js

@@ -0,0 +1,8 @@
+module.exports = {
+  rules: {
+    '@typescript-eslint/consistent-type-imports': [
+      'error',
+      { prefer: 'no-type-imports', disallowTypeAnnotations: false },
+    ],
+  },
+};

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

@@ -1,20 +1,24 @@
-import type { BuilderContext, BuilderOutput, Target } from '@angular-devkit/architect';
-import { createBuilder, targetFromTargetString } from '@angular-devkit/architect';
-import type { JsonObject } from '@angular-devkit/core';
-import type { Observable } from 'rxjs';
-import { from, of, throwError } from 'rxjs';
-import type { CLIOptions } from '@storybook/types';
+import {
+  BuilderContext,
+  BuilderOutput,
+  Target,
+  createBuilder,
+  targetFromTargetString,
+} from '@angular-devkit/architect';
+import { JsonObject } from '@angular-devkit/core';
+import { Observable, from, of, throwError } from 'rxjs';
+import { CLIOptions } from '@storybook/types';
 import { catchError, map, mapTo, switchMap } from 'rxjs/operators';
 import { sync as findUpSync } from 'find-up';
 import { sync as readUpSync } from 'read-pkg-up';
-import type {
+import {
   BrowserBuilderOptions,
   ExtraEntryPoint,
   StylePreprocessorOptions,
 } from '@angular-devkit/build-angular';
 
 import { buildStaticStandalone } from '@storybook/core-server';
-import type { StandaloneOptions } from '../utils/standalone-options';
+import { StandaloneOptions } from '../utils/standalone-options';
 import { runCompodoc } from '../utils/run-compodoc';
 import { buildStandaloneErrorHandler } from '../utils/build-standalone-errors-handler';
 

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

@@ -1,19 +1,24 @@
-import type { BuilderContext, BuilderOutput, Target } from '@angular-devkit/architect';
-import { createBuilder, targetFromTargetString } from '@angular-devkit/architect';
-import type { JsonObject } from '@angular-devkit/core';
-import type {
+import {
+  BuilderContext,
+  BuilderOutput,
+  Target,
+  createBuilder,
+  targetFromTargetString,
+} from '@angular-devkit/architect';
+import { JsonObject } from '@angular-devkit/core';
+import {
   BrowserBuilderOptions,
   ExtraEntryPoint,
   StylePreprocessorOptions,
 } from '@angular-devkit/build-angular';
 import { from, Observable, of } from 'rxjs';
-import type { CLIOptions } from '@storybook/types';
+import { CLIOptions } from '@storybook/types';
 import { map, switchMap, mapTo } from 'rxjs/operators';
 import { sync as findUpSync } from 'find-up';
 import { sync as readUpSync } from 'read-pkg-up';
 
 import { buildDevStandalone } from '@storybook/core-server';
-import type { StandaloneOptions } from '../utils/standalone-options';
+import { StandaloneOptions } from '../utils/standalone-options';
 import { runCompodoc } from '../utils/run-compodoc';
 import { buildStandaloneErrorHandler } from '../utils/build-standalone-errors-handler';
 

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

@@ -1,5 +1,5 @@
-import type { BuilderContext } from '@angular-devkit/architect';
-import type { LoggerApi } from '@angular-devkit/core/src/logger';
+import { BuilderContext } from '@angular-devkit/architect';
+import { LoggerApi } from '@angular-devkit/core/src/logger';
 import { take } from 'rxjs/operators';
 
 const cpSpawnMock = {

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

@@ -1,4 +1,4 @@
-import type { BuilderContext } from '@angular-devkit/architect';
+import { BuilderContext } from '@angular-devkit/architect';
 import { spawn } from 'child_process';
 import { Observable } from 'rxjs';
 import * as path from 'path';

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

@@ -1,5 +1,5 @@
-import type { BuilderContext } from '@angular-devkit/architect';
-import type { LoadOptions, CLIOptions, BuilderOptions } from '@storybook/types';
+import { BuilderContext } from '@angular-devkit/architect';
+import { LoadOptions, CLIOptions, BuilderOptions } from '@storybook/types';
 
 export type StandaloneOptions = Partial<
   CLIOptions &

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

@@ -1,11 +1,9 @@
-import type { NgModule, PlatformRef } from '@angular/core';
-import { enableProdMode } from '@angular/core';
+import { NgModule, PlatformRef, enableProdMode } from '@angular/core';
 import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
 
-import type { Subject } from 'rxjs';
-import { BehaviorSubject } from 'rxjs';
+import { Subject, BehaviorSubject } from 'rxjs';
 import { stringify } from 'telejson';
-import type { ICollection, StoryFnAngularReturnType, Parameters } from '../types';
+import { ICollection, StoryFnAngularReturnType, Parameters } from '../types';
 import { createStorybookModule, getStorybookModuleMetadata } from './StorybookModule';
 
 type StoryRenderInfo = {

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

@@ -1,5 +1,5 @@
 import { AbstractRenderer } from './AbstractRenderer';
-import type { StoryFnAngularReturnType, Parameters } from '../types';
+import { StoryFnAngularReturnType, Parameters } from '../types';
 
 export class CanvasRenderer extends AbstractRenderer {
   public async render(options: {

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

@@ -1,8 +1,7 @@
 import { Component } from '@angular/core';
-import type { API_ArgTypes } from '@storybook/types';
+import { API_ArgTypes } from '@storybook/types';
 import { computesTemplateSourceFromComponent } from './ComputesTemplateFromComponent';
-import type { ISomeInterface } from './__testfixtures__/input.component';
-import { ButtonAccent, InputComponent } from './__testfixtures__/input.component';
+import { ISomeInterface, ButtonAccent, InputComponent } from './__testfixtures__/input.component';
 
 describe('angular source decorator', () => {
   it('With no props should generate simple tag', () => {

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

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