Merge pull request #19368 from storybookjs/angular/remove-angular-12-…

…support refactor(angular): drop support for angular < 13
storybookjs · Oct 6, 2022 · ee51172 · ee51172
2 parents a8eb65c + 3fc5a29
commit ee51172
Show file tree

Hide file tree

Showing 16 changed files with 34 additions and 764 deletions.
diff --git a/MIGRATION.md b/MIGRATION.md
@@ -23,6 +23,7 @@
     - [Removed STORYBOOK_REACT_CLASSES global](#removed-storybook_react_classes-global)
     - [Icons API changed](#icons-api-changed)
     - ['config' preset entry replaced with 'previewAnnotations'](#config-preset-entry-replaced-with-previewannotations)
+    - [Dropped support for Angular 12 and below](#dropped-support-for-angular-12-and-below)
   - [Docs Changes](#docs-changes)
     - [Standalone docs files](#standalone-docs-files)
     - [Referencing stories in docs files](#referencing-stories-in-docs-files)
@@ -555,6 +556,13 @@ The preset field `'config'` has been replaced with `'previewAnnotations'`. `'con
 
 Additionally, the internal field `'previewEntries'` has been removed. If you need a preview entry, just use a `'previewAnnotations'` file and don't export anything.
 
+#### Dropped support for Angular 12 and below
+
+Official [Angular 12 LTS support ends Nov 2022](https://angular.io/guide/releases#actively-supported-versions). With that, Storybook also drops its support 
+for Angular 12 and below. 
+
+In order to use Storybook 7.0, you need to upgrade to at least Angular 13.
+
 #### Vue2 DOM structure changed
 
 In 6.x, `@storybook/vue` would replace the "root" element (formerly `#root`, now `#storybook-root`) with a new node that contains the rendered children. This was problematic because it broke the `play` function, which often starts with `within(canvasElement)` and the old `canvasElement` would get replaced out from under the play function.

diff --git a/code/addons/storyshots/storyshots-core/package.json b/code/addons/storyshots/storyshots-core/package.json
@@ -77,8 +77,8 @@
     "vue-jest": "^5.0.0-alpha.8"
   },
   "peerDependencies": {
-    "@angular/core": ">=6.0.0",
-    "@angular/platform-browser-dynamic": ">=6.0.0",
+    "@angular/core": ">=13.0.0",
+    "@angular/platform-browser-dynamic": ">=13.0.0",
     "@storybook/angular": "*",
     "@storybook/react": "*",
     "@storybook/vue": "*",

diff --git a/code/frameworks/angular/package.json b/code/frameworks/angular/package.json
@@ -97,17 +97,17 @@
     "webpack": "5"
   },
   "peerDependencies": {
-    "@angular-devkit/architect": ">=0.8.9",
-    "@angular-devkit/build-angular": ">=0.8.9 || >= 12.0.0",
-    "@angular-devkit/core": "^0.6.1 || >=7.0.0",
-    "@angular/cli": ">=6.0.0",
-    "@angular/common": ">=6.0.0",
-    "@angular/compiler": ">=6.0.0",
-    "@angular/compiler-cli": ">=6.0.0",
-    "@angular/core": ">=6.0.0",
-    "@angular/forms": ">=6.0.0",
-    "@angular/platform-browser": ">=6.0.0",
-    "@angular/platform-browser-dynamic": ">=6.0.0",
+    "@angular-devkit/architect": ">=0.1300.0",
+    "@angular-devkit/build-angular": ">=13.0.0",
+    "@angular-devkit/core": ">=13.0.0",
+    "@angular/cli": ">=13.0.0",
+    "@angular/common": ">=13.0.0",
+    "@angular/compiler": ">=13.0.0",
+    "@angular/compiler-cli": ">=13.0.0",
+    "@angular/core": ">=13.0.0",
+    "@angular/forms": ">=13.0.0",
+    "@angular/platform-browser": ">=13.0.0",
+    "@angular/platform-browser-dynamic": ">=13.0.0",
     "@babel/core": "*",
     "@nrwl/workspace": "14.6.1",
     "rxjs": "^6.0.0 || ^7.4.0",

diff --git a/code/frameworks/angular/src/preset.ts b/code/frameworks/angular/src/preset.ts
@@ -3,7 +3,6 @@ import type { PresetProperty } from '@storybook/core-common';
 import { StorybookConfig } from './types';
 
 export const addons: PresetProperty<'addons', StorybookConfig> = [
-  require.resolve('./server/framework-preset-angular'),
   require.resolve('./server/framework-preset-angular-cli'),
   require.resolve('./server/framework-preset-angular-ivy'),
   require.resolve('./server/framework-preset-angular-docs'),

diff --git a/code/frameworks/angular/src/server/__tests__/create-fork-ts-checker-plugin.test.ts b/code/frameworks/angular/src/server/__tests__/create-fork-ts-checker-plugin.test.ts
diff --git a/code/frameworks/angular/src/server/__tests__/ts_config.test.ts b/code/frameworks/angular/src/server/__tests__/ts_config.test.ts
diff --git a/code/frameworks/angular/src/server/angular-cli-webpack-12.2.x.d.ts b/code/frameworks/angular/src/server/angular-cli-webpack-12.2.x.d.ts
diff --git a/code/frameworks/angular/src/server/angular-cli-webpack-12.2.x.js b/code/frameworks/angular/src/server/angular-cli-webpack-12.2.x.js