Merge branch 'next' of github.com:storybookjs/storybook into next

storybookjs · Nov 18, 2020 · 875b933 · 875b933
2 parents cd7766e + f701930
commit 875b933
Show file tree

Hide file tree

Showing 7 changed files with 694 additions and 679 deletions.
diff --git a/addons/docs/package.json b/addons/docs/package.json
@@ -81,7 +81,7 @@
     "util-deprecate": "^1.0.2"
   },
   "devDependencies": {
-    "@angular/core": "^10.2.2",
+    "@angular/core": "^11.0.0",
     "@babel/core": "^7.12.3",
     "@emotion/core": "^10.1.1",
     "@emotion/styled": "^10.0.23",
@@ -112,7 +112,7 @@
     "tslib": "^2.0.0",
     "web-component-analyzer": "^1.0.3",
     "webpack": "^4.44.2",
-    "zone.js": "^0.10.2"
+    "zone.js": "^0.11.3"
   },
   "peerDependencies": {
     "@babel/core": "^7.11.5",

diff --git a/app/angular/package.json b/app/angular/package.json
@@ -54,29 +54,31 @@
     "webpack": "^4.44.2"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "~0.1002.0",
-    "@angular-devkit/core": "^10.2.0",
-    "@angular/common": "^10.2.2",
-    "@angular/compiler": "^10.2.2",
-    "@angular/core": "^10.2.2",
-    "@angular/forms": "^10.2.2",
-    "@angular/platform-browser": "^10.2.2",
-    "@angular/platform-browser-dynamic": "^10.2.2",
+    "@angular-devkit/build-angular": "~0.1100.1",
+    "@angular-devkit/core": "^11.0.1",
+    "@angular/common": "^11.0.0",
+    "@angular/compiler": "^11.0.0",
+    "@angular/compiler-cli": "^11.0.0",
+    "@angular/core": "^11.0.0",
+    "@angular/forms": "^11.0.0",
+    "@angular/platform-browser": "^11.0.0",
+    "@angular/platform-browser-dynamic": "^11.0.0",
     "@types/autoprefixer": "^9.4.0"
   },
   "peerDependencies": {
     "@angular-devkit/build-angular": ">=0.8.9",
     "@angular-devkit/core": "^0.6.1 || >=7.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",
     "@babel/core": "*",
     "rxjs": "^6.0.0",
     "typescript": "^3.4.0 || >=4.0.0",
-    "zone.js": "^0.8.29 || ^0.9.0 || ^0.10.0"
+    "zone.js": "^0.8.29 || ^0.9.0 || ^0.10.0 || ^0.11.0"
   },
   "engines": {
     "node": ">=8.0.0"

diff --git a/examples/angular-cli/angular.json b/examples/angular-cli/angular.json
@@ -38,7 +38,6 @@
               "optimization": true,
               "outputHashing": "all",
               "sourceMap": false,
-              "extractCss": true,
               "namedChunks": false,
               "aot": true,
               "extractLicenses": true,

diff --git a/examples/angular-cli/jest.config.js b/examples/angular-cli/jest.config.js
@@ -9,6 +9,12 @@ module.exports = {
     'ts-jest': {
       tsConfig: path.join(__dirname, 'src/tsconfig.spec.json'),
       stringifyContentPathRegex: '\\.html$',
+      astTransformers: {
+        before: [
+          'jest-preset-angular/build/InlineFilesTransformer',
+          'jest-preset-angular/build/StripStylesTransformer',
+        ],
+      },
     },
   },
   roots: [__dirname],

diff --git a/examples/angular-cli/package.json b/examples/angular-cli/package.json
@@ -19,23 +19,23 @@
     "test:watch": "jest --watch"
   },
   "dependencies": {
-    "@angular/common": "^10.2.2",
-    "@angular/compiler": "^10.2.2",
-    "@angular/core": "^10.2.2",
-    "@angular/forms": "^10.2.2",
-    "@angular/platform-browser": "^10.2.2",
-    "@angular/platform-browser-dynamic": "^10.2.2",
+    "@angular/common": "^11.0.0",
+    "@angular/compiler": "^11.0.0",
+    "@angular/core": "^11.0.0",
+    "@angular/forms": "^11.0.0",
+    "@angular/platform-browser": "^11.0.0",
+    "@angular/platform-browser-dynamic": "^11.0.0",
     "@ngrx/store": "^10.0.1",
     "core-js": "^3.7.0",
     "node-sass": "^4.14.0",
     "rxjs": "^6.6.3",
-    "zone.js": "^0.10.2"
+    "zone.js": "^0.11.3"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "~0.1002.0",
-    "@angular-devkit/core": "^10.2.0",
-    "@angular/cli": "^10.2.0",
-    "@angular/compiler-cli": "^10.2.2",
+    "@angular-devkit/build-angular": "~0.1100.1",
+    "@angular-devkit/core": "^11.0.1",
+    "@angular/cli": "^11.0.1",
+    "@angular/compiler-cli": "^11.0.0",
     "@compodoc/compodoc": "^1.1.11",
     "@storybook/addon-a11y": "6.1.0-rc.4",
     "@storybook/addon-actions": "6.1.0-rc.4",
@@ -56,14 +56,14 @@
     "@types/webpack-env": "^1.15.3",
     "babel-plugin-require-context-hook": "^1.0.0",
     "global": "^4.3.2",
-    "jasmine-core": "~3.5.0",
-    "jasmine-spec-reporter": "~5.0.2",
+    "jasmine-core": "~3.6.0",
+    "jasmine-spec-reporter": "~5.0.0",
     "jest": "^26.0.0",
     "jest-preset-angular": "^8.3.2",
     "protractor": "~7.0.0",
     "ts-jest": "^26.4.4",
     "ts-node": "^8.10.2",
-    "typescript": "^3.9.3"
+    "typescript": "^4.0.5"
   },
   "storybook": {
     "chromatic": {

diff --git a/examples/angular-cli/src/stories/addon-docs.stories.mdx b/examples/angular-cli/src/stories/addon-docs.stories.mdx
@@ -79,7 +79,7 @@ Let's add another one. The UI updates automatically as you'd expect.
 
 We can automatically generate props tables from Angular components:
 
-<ArgsTable of={DocsButtonComponent} />
+<ArgsTable of={DocButtonComponent} />
 
 ## More info