From da46fc4c2b5b0cc11c23c49b6a37783eb9b8a0b8 Mon Sep 17 00:00:00 2001 From: Brett Upton Date: Fri, 9 Jul 2021 00:09:05 +0200 Subject: [PATCH 1/4] Fix Storybook composition order --- examples/composition/.gitignore | 41 +++++++++++ examples/composition/.storybook/main.js | 25 +++++++ examples/composition/.storybook/preview.js | 5 ++ examples/composition/.storybook/tsconfig.json | 15 ++++ examples/composition/angular.json | 72 +++++++++++++++++++ examples/composition/package.json | 58 +++++++++++++++ .../composition/src/Introduction.stories.mdx | 9 +++ examples/composition/src/test.ts | 0 examples/composition/src/tsconfig.app.json | 15 ++++ examples/composition/tsconfig.json | 19 +++++ 10 files changed, 259 insertions(+) create mode 100644 examples/composition/.gitignore create mode 100644 examples/composition/.storybook/main.js create mode 100644 examples/composition/.storybook/preview.js create mode 100644 examples/composition/.storybook/tsconfig.json create mode 100644 examples/composition/angular.json create mode 100644 examples/composition/package.json create mode 100644 examples/composition/src/Introduction.stories.mdx create mode 100644 examples/composition/src/test.ts create mode 100644 examples/composition/src/tsconfig.app.json create mode 100644 examples/composition/tsconfig.json diff --git a/examples/composition/.gitignore b/examples/composition/.gitignore new file mode 100644 index 000000000000..7a5ad868aa59 --- /dev/null +++ b/examples/composition/.gitignore @@ -0,0 +1,41 @@ +# See http://help.github.com/ignore-files/ for more about ignoring files. + +# compiled output +/dist +/tmp +/out-tsc + +# dependencies +/node_modules + +# IDEs and editors +/.idea +.project +.classpath +.c9/ +*.launch +.settings/ +*.sublime-workspace + +# IDE - VSCode +.vscode/* +!.vscode/settings.json +!.vscode/tasks.json +!.vscode/launch.json +!.vscode/extensions.json + +# misc +/.sass-cache +/connect.lock +/coverage +/libpeerconnection.log +npm-debug.log +yarn-error.log +testem.log +/typings + +# System Files +.DS_Store +Thumbs.db +addon-jest.testresults.json +documentation.json diff --git a/examples/composition/.storybook/main.js b/examples/composition/.storybook/main.js new file mode 100644 index 000000000000..a56361ea4eef --- /dev/null +++ b/examples/composition/.storybook/main.js @@ -0,0 +1,25 @@ +module.exports = { + stories: ['../src/**/*.stories.@(ts|mdx)'], + logLevel: 'debug', + addons: ['@storybook/addon-docs', '@storybook/addon-controls'], + core: { + builder: 'webpack4', + }, + angularOptions: { + enableIvy: true, + }, + refs: { + first: { + title: 'First storybook', + url: 'https://storybookjs.netlify.app/angular-cli', + }, + second: { + title: 'Second storybook', + url: 'https://storybookjs.netlify.app/angular-cli', + }, + third: { + title: 'Third storybook', + url: 'https://storybookjs.netlify.app/angular-cli', + }, + }, +}; diff --git a/examples/composition/.storybook/preview.js b/examples/composition/.storybook/preview.js new file mode 100644 index 000000000000..bd8f5b4bddae --- /dev/null +++ b/examples/composition/.storybook/preview.js @@ -0,0 +1,5 @@ +export const parameters = { + docs: { + inlineStories: true, + }, +}; diff --git a/examples/composition/.storybook/tsconfig.json b/examples/composition/.storybook/tsconfig.json new file mode 100644 index 000000000000..8d10338eba3e --- /dev/null +++ b/examples/composition/.storybook/tsconfig.json @@ -0,0 +1,15 @@ +{ + "extends": "../tsconfig.json", + "compilerOptions": { + "outDir": "../out-tsc/app", + "baseUrl": "./", + "module": "es2015", + "types": [ + "node" + ] + }, + "include": ["../src/**/*", "*.js"], + "exclude": [ + "**/*.spec.ts" + ] +} diff --git a/examples/composition/angular.json b/examples/composition/angular.json new file mode 100644 index 000000000000..a48c75bb1e3c --- /dev/null +++ b/examples/composition/angular.json @@ -0,0 +1,72 @@ +{ + /* angular.json can have comments */ + // angular.json can have comments + "$schema": "../../node_modules/@angular/cli/lib/config/schema.json", + "version": 1, + "newProjectRoot": "projects", + "projects": { + "composition": { + "root": "", + "sourceRoot": "src", + "projectType": "application", + "prefix": "app", + "schematics": {}, + "architect": { + "build": { + "builder": "@angular-devkit/build-angular:browser", + "options": { + "outputPath": "dist/composition", + "index": "src/index.html", + "main": "src/main.ts", + "polyfills": "src/polyfills.ts", + "tsConfig": "src/tsconfig.app.json", + "scripts": [] + }, + "configurations": { + "production": { + "fileReplacements": [ + { + "replace": "src/environments/environment.ts", + "with": "src/environments/environment.prod.ts" + } + ], + "optimization": true, + "outputHashing": "all", + "sourceMap": false, + "namedChunks": false, + "aot": true, + "extractLicenses": true, + "vendorChunk": false, + "buildOptimizer": true + } + } + }, + "serve": { + "builder": "@angular-devkit/build-angular:dev-server", + "options": { + "browserTarget": "angular-cli:build" + }, + "configurations": { + "production": { + "browserTarget": "angular-cli:build:production" + } + } + }, + "storybook": { + "builder": "@storybook/angular:start-storybook", + "options": { + "browserTarget": "composition:build", + "port": 4400 + } + }, + "build-storybook": { + "builder": "@storybook/angular:build-storybook", + "options": { + "browserTarget": "composition:build" + } + } + } + } + }, + "defaultProject": "composition" +} diff --git a/examples/composition/package.json b/examples/composition/package.json new file mode 100644 index 000000000000..2346165d6cf7 --- /dev/null +++ b/examples/composition/package.json @@ -0,0 +1,58 @@ +{ + "name": "composition", + "version": "6.4.0-alpha.6", + "private": true, + "license": "MIT", + "scripts": { + "build": "ng build", + "build-storybook": "yarn storybook-prebuild && build-storybook -s src/assets", + "docs:json": "compodoc -p ./tsconfig.json -e json -d .", + "e2e": "ng e2e", + "ng": "ng", + "start": "ng serve", + "storybook": "start-storybook -p 9008 -s src/assets", + "test": "jest", + "test:coverage": "jest --coverage", + "test:generate-output": "jest --json --config=jest.addon-config.js --outputFile=addon-jest.testresults.json || true", + "test:watch": "jest --watch" + }, + "dependencies": { + "@angular/common": "^11.2.14", + "@angular/compiler": "^11.2.14", + "@angular/core": "^11.2.14", + "@angular/forms": "^11.2.14", + "@angular/platform-browser": "^11.2.14", + "@angular/platform-browser-dynamic": "^11.2.14", + "core-js": "^3.8.2", + "node-sass": "^4.14.1", + "rxjs": "^6.6.3", + "zone.js": "^0.11.3" + }, + "devDependencies": { + "@angular-devkit/build-angular": "~0.1102.13", + "@angular-devkit/core": "^11.2.13", + "@angular/cli": "^11.2.13", + "@angular/compiler-cli": "^11.2.14", + "@storybook/addon-jest": "6.4.0-alpha.6", + "@storybook/addon-links": "6.4.0-alpha.6", + "@storybook/addons": "6.4.0-alpha.6", + "@storybook/angular": "6.4.0-alpha.6", + "@storybook/source-loader": "6.4.0-alpha.6", + "@types/core-js": "^2.5.4", + "@types/jest": "^26.0.16", + "@types/node": "^14.14.20", + "@types/webpack-env": "^1.16.0", + "@webcomponents/custom-elements": "^1.4.3", + "babel-plugin-require-context-hook": "^1.0.0", + "global": "^4.4.0", + "storybook-addon-angular-ivy": "^0.0.1", + "ts-jest": "^26.4.4", + "ts-node": "^9.1.0", + "typescript": "^4.1.3" + }, + "storybook": { + "chromatic": { + "projectToken": "tl92yzsj6w" + } + } +} diff --git a/examples/composition/src/Introduction.stories.mdx b/examples/composition/src/Introduction.stories.mdx new file mode 100644 index 000000000000..08c9d3b41c66 --- /dev/null +++ b/examples/composition/src/Introduction.stories.mdx @@ -0,0 +1,9 @@ +import { Meta } from '@storybook/addon-docs'; + + + +# Storybook Composition + +Composing multiple Storybook sites. + +Order is set according to the order of refs in main.js diff --git a/examples/composition/src/test.ts b/examples/composition/src/test.ts new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/examples/composition/src/tsconfig.app.json b/examples/composition/src/tsconfig.app.json new file mode 100644 index 000000000000..a2e2c05f4a36 --- /dev/null +++ b/examples/composition/src/tsconfig.app.json @@ -0,0 +1,15 @@ +{ + "extends": "../tsconfig.json", + "compilerOptions": { + "outDir": "../out-tsc/app", + "baseUrl": "./", + "module": "es2015", + "types": [ + "node" + ] + }, + "exclude": [ + "karma.ts", + "**/*.spec.ts" + ] +} diff --git a/examples/composition/tsconfig.json b/examples/composition/tsconfig.json new file mode 100644 index 000000000000..7b0d44572b22 --- /dev/null +++ b/examples/composition/tsconfig.json @@ -0,0 +1,19 @@ +{ + "lerna": { + "disabled": true + }, + "compileOnSave": false, + "compilerOptions": { + "outDir": "./dist/out-tsc", + "sourceMap": true, + "moduleResolution": "node", + "emitDecoratorMetadata": true, + "experimentalDecorators": true, + "allowSyntheticDefaultImports": true, + "esModuleInterop": true, + "skipLibCheck": true, + "target": "es5", + "typeRoots": ["../../node_modules/@types", "node_modules/@types"], + "lib": ["es2017", "dom"] + } +} From 8c1a3e6c97bcb7e0d325d03749bddd177329d052 Mon Sep 17 00:00:00 2001 From: Brett Upton Date: Fri, 9 Jul 2021 00:22:20 +0200 Subject: [PATCH 2/4] Fix Storybook composition order --- lib/api/src/modules/refs.ts | 9 ++++++++- yarn.lock | 37 +++++++++++++++++++++++++++++++++++++ 2 files changed, 45 insertions(+), 1 deletion(-) diff --git a/lib/api/src/modules/refs.ts b/lib/api/src/modules/refs.ts index 80d54adc2a7b..12d11de96fad 100644 --- a/lib/api/src/modules/refs.ts +++ b/lib/api/src/modules/refs.ts @@ -228,8 +228,15 @@ export const init: ModuleFn = ({ store, provider, singleStory }, { runCheck = tr updated[id] = { ...ref, ...data }; + /* eslint-disable no-param-reassign */ + const ordered = Object.keys(initialState).reduce((obj: any, key) => { + obj[key] = updated[key]; + return obj; + }, {}); + /* eslint-enable no-param-reassign */ + store.setState({ - refs: updated, + refs: ordered, }); }, }; diff --git a/yarn.lock b/yarn.lock index 1f45696f6f98..10e93bd5b8a7 100644 --- a/yarn.lock +++ b/yarn.lock @@ -15784,6 +15784,43 @@ __metadata: languageName: node linkType: hard +"composition@workspace:examples/composition": + version: 0.0.0-use.local + resolution: "composition@workspace:examples/composition" + dependencies: + "@angular-devkit/build-angular": ~0.1102.13 + "@angular-devkit/core": ^11.2.13 + "@angular/cli": ^11.2.13 + "@angular/common": ^11.2.14 + "@angular/compiler": ^11.2.14 + "@angular/compiler-cli": ^11.2.14 + "@angular/core": ^11.2.14 + "@angular/forms": ^11.2.14 + "@angular/platform-browser": ^11.2.14 + "@angular/platform-browser-dynamic": ^11.2.14 + "@storybook/addon-jest": 6.4.0-alpha.6 + "@storybook/addon-links": 6.4.0-alpha.6 + "@storybook/addons": 6.4.0-alpha.6 + "@storybook/angular": 6.4.0-alpha.6 + "@storybook/source-loader": 6.4.0-alpha.6 + "@types/core-js": ^2.5.4 + "@types/jest": ^26.0.16 + "@types/node": ^14.14.20 + "@types/webpack-env": ^1.16.0 + "@webcomponents/custom-elements": ^1.4.3 + babel-plugin-require-context-hook: ^1.0.0 + core-js: ^3.8.2 + global: ^4.4.0 + node-sass: ^4.14.1 + rxjs: ^6.6.3 + storybook-addon-angular-ivy: ^0.0.1 + ts-jest: ^26.4.4 + ts-node: ^9.1.0 + typescript: ^4.1.3 + zone.js: ^0.11.3 + languageName: unknown + linkType: soft + "compressible@npm:~2.0.16": version: 2.0.18 resolution: "compressible@npm:2.0.18" From 12a34928933dd5b25aceb26093cf87d1f38ecd9f Mon Sep 17 00:00:00 2001 From: Brett Upton Date: Fri, 9 Jul 2021 08:02:20 +0200 Subject: [PATCH 3/4] Moved composition into an existing example project --- examples/angular-cli/.storybook/main.js | 15 ++++ examples/composition/.gitignore | 41 ----------- examples/composition/.storybook/main.js | 25 ------- examples/composition/.storybook/preview.js | 5 -- examples/composition/.storybook/tsconfig.json | 15 ---- examples/composition/angular.json | 72 ------------------- examples/composition/package.json | 58 --------------- .../composition/src/Introduction.stories.mdx | 9 --- examples/composition/src/test.ts | 0 examples/composition/src/tsconfig.app.json | 15 ---- examples/composition/tsconfig.json | 19 ----- yarn.lock | 37 ---------- 12 files changed, 15 insertions(+), 296 deletions(-) delete mode 100644 examples/composition/.gitignore delete mode 100644 examples/composition/.storybook/main.js delete mode 100644 examples/composition/.storybook/preview.js delete mode 100644 examples/composition/.storybook/tsconfig.json delete mode 100644 examples/composition/angular.json delete mode 100644 examples/composition/package.json delete mode 100644 examples/composition/src/Introduction.stories.mdx delete mode 100644 examples/composition/src/test.ts delete mode 100644 examples/composition/src/tsconfig.app.json delete mode 100644 examples/composition/tsconfig.json diff --git a/examples/angular-cli/.storybook/main.js b/examples/angular-cli/.storybook/main.js index f1f13f593535..7602f927eb2d 100644 --- a/examples/angular-cli/.storybook/main.js +++ b/examples/angular-cli/.storybook/main.js @@ -19,4 +19,19 @@ module.exports = { angularOptions: { enableIvy: true, }, + // These are just here to test composition. They could be added to any storybook example project + refs: { + first: { + title: 'Composition test one', + url: 'https://storybookjs.netlify.app/cra-ts-essentials', + }, + second: { + title: 'Composition test one', + url: 'https://storybookjs.netlify.app/cra-ts-essentials', + }, + third: { + title: 'Composition test one', + url: 'https://storybookjs.netlify.app/cra-ts-essentials', + }, + }, }; diff --git a/examples/composition/.gitignore b/examples/composition/.gitignore deleted file mode 100644 index 7a5ad868aa59..000000000000 --- a/examples/composition/.gitignore +++ /dev/null @@ -1,41 +0,0 @@ -# See http://help.github.com/ignore-files/ for more about ignoring files. - -# compiled output -/dist -/tmp -/out-tsc - -# dependencies -/node_modules - -# IDEs and editors -/.idea -.project -.classpath -.c9/ -*.launch -.settings/ -*.sublime-workspace - -# IDE - VSCode -.vscode/* -!.vscode/settings.json -!.vscode/tasks.json -!.vscode/launch.json -!.vscode/extensions.json - -# misc -/.sass-cache -/connect.lock -/coverage -/libpeerconnection.log -npm-debug.log -yarn-error.log -testem.log -/typings - -# System Files -.DS_Store -Thumbs.db -addon-jest.testresults.json -documentation.json diff --git a/examples/composition/.storybook/main.js b/examples/composition/.storybook/main.js deleted file mode 100644 index a56361ea4eef..000000000000 --- a/examples/composition/.storybook/main.js +++ /dev/null @@ -1,25 +0,0 @@ -module.exports = { - stories: ['../src/**/*.stories.@(ts|mdx)'], - logLevel: 'debug', - addons: ['@storybook/addon-docs', '@storybook/addon-controls'], - core: { - builder: 'webpack4', - }, - angularOptions: { - enableIvy: true, - }, - refs: { - first: { - title: 'First storybook', - url: 'https://storybookjs.netlify.app/angular-cli', - }, - second: { - title: 'Second storybook', - url: 'https://storybookjs.netlify.app/angular-cli', - }, - third: { - title: 'Third storybook', - url: 'https://storybookjs.netlify.app/angular-cli', - }, - }, -}; diff --git a/examples/composition/.storybook/preview.js b/examples/composition/.storybook/preview.js deleted file mode 100644 index bd8f5b4bddae..000000000000 --- a/examples/composition/.storybook/preview.js +++ /dev/null @@ -1,5 +0,0 @@ -export const parameters = { - docs: { - inlineStories: true, - }, -}; diff --git a/examples/composition/.storybook/tsconfig.json b/examples/composition/.storybook/tsconfig.json deleted file mode 100644 index 8d10338eba3e..000000000000 --- a/examples/composition/.storybook/tsconfig.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "extends": "../tsconfig.json", - "compilerOptions": { - "outDir": "../out-tsc/app", - "baseUrl": "./", - "module": "es2015", - "types": [ - "node" - ] - }, - "include": ["../src/**/*", "*.js"], - "exclude": [ - "**/*.spec.ts" - ] -} diff --git a/examples/composition/angular.json b/examples/composition/angular.json deleted file mode 100644 index a48c75bb1e3c..000000000000 --- a/examples/composition/angular.json +++ /dev/null @@ -1,72 +0,0 @@ -{ - /* angular.json can have comments */ - // angular.json can have comments - "$schema": "../../node_modules/@angular/cli/lib/config/schema.json", - "version": 1, - "newProjectRoot": "projects", - "projects": { - "composition": { - "root": "", - "sourceRoot": "src", - "projectType": "application", - "prefix": "app", - "schematics": {}, - "architect": { - "build": { - "builder": "@angular-devkit/build-angular:browser", - "options": { - "outputPath": "dist/composition", - "index": "src/index.html", - "main": "src/main.ts", - "polyfills": "src/polyfills.ts", - "tsConfig": "src/tsconfig.app.json", - "scripts": [] - }, - "configurations": { - "production": { - "fileReplacements": [ - { - "replace": "src/environments/environment.ts", - "with": "src/environments/environment.prod.ts" - } - ], - "optimization": true, - "outputHashing": "all", - "sourceMap": false, - "namedChunks": false, - "aot": true, - "extractLicenses": true, - "vendorChunk": false, - "buildOptimizer": true - } - } - }, - "serve": { - "builder": "@angular-devkit/build-angular:dev-server", - "options": { - "browserTarget": "angular-cli:build" - }, - "configurations": { - "production": { - "browserTarget": "angular-cli:build:production" - } - } - }, - "storybook": { - "builder": "@storybook/angular:start-storybook", - "options": { - "browserTarget": "composition:build", - "port": 4400 - } - }, - "build-storybook": { - "builder": "@storybook/angular:build-storybook", - "options": { - "browserTarget": "composition:build" - } - } - } - } - }, - "defaultProject": "composition" -} diff --git a/examples/composition/package.json b/examples/composition/package.json deleted file mode 100644 index 2346165d6cf7..000000000000 --- a/examples/composition/package.json +++ /dev/null @@ -1,58 +0,0 @@ -{ - "name": "composition", - "version": "6.4.0-alpha.6", - "private": true, - "license": "MIT", - "scripts": { - "build": "ng build", - "build-storybook": "yarn storybook-prebuild && build-storybook -s src/assets", - "docs:json": "compodoc -p ./tsconfig.json -e json -d .", - "e2e": "ng e2e", - "ng": "ng", - "start": "ng serve", - "storybook": "start-storybook -p 9008 -s src/assets", - "test": "jest", - "test:coverage": "jest --coverage", - "test:generate-output": "jest --json --config=jest.addon-config.js --outputFile=addon-jest.testresults.json || true", - "test:watch": "jest --watch" - }, - "dependencies": { - "@angular/common": "^11.2.14", - "@angular/compiler": "^11.2.14", - "@angular/core": "^11.2.14", - "@angular/forms": "^11.2.14", - "@angular/platform-browser": "^11.2.14", - "@angular/platform-browser-dynamic": "^11.2.14", - "core-js": "^3.8.2", - "node-sass": "^4.14.1", - "rxjs": "^6.6.3", - "zone.js": "^0.11.3" - }, - "devDependencies": { - "@angular-devkit/build-angular": "~0.1102.13", - "@angular-devkit/core": "^11.2.13", - "@angular/cli": "^11.2.13", - "@angular/compiler-cli": "^11.2.14", - "@storybook/addon-jest": "6.4.0-alpha.6", - "@storybook/addon-links": "6.4.0-alpha.6", - "@storybook/addons": "6.4.0-alpha.6", - "@storybook/angular": "6.4.0-alpha.6", - "@storybook/source-loader": "6.4.0-alpha.6", - "@types/core-js": "^2.5.4", - "@types/jest": "^26.0.16", - "@types/node": "^14.14.20", - "@types/webpack-env": "^1.16.0", - "@webcomponents/custom-elements": "^1.4.3", - "babel-plugin-require-context-hook": "^1.0.0", - "global": "^4.4.0", - "storybook-addon-angular-ivy": "^0.0.1", - "ts-jest": "^26.4.4", - "ts-node": "^9.1.0", - "typescript": "^4.1.3" - }, - "storybook": { - "chromatic": { - "projectToken": "tl92yzsj6w" - } - } -} diff --git a/examples/composition/src/Introduction.stories.mdx b/examples/composition/src/Introduction.stories.mdx deleted file mode 100644 index 08c9d3b41c66..000000000000 --- a/examples/composition/src/Introduction.stories.mdx +++ /dev/null @@ -1,9 +0,0 @@ -import { Meta } from '@storybook/addon-docs'; - - - -# Storybook Composition - -Composing multiple Storybook sites. - -Order is set according to the order of refs in main.js diff --git a/examples/composition/src/test.ts b/examples/composition/src/test.ts deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/examples/composition/src/tsconfig.app.json b/examples/composition/src/tsconfig.app.json deleted file mode 100644 index a2e2c05f4a36..000000000000 --- a/examples/composition/src/tsconfig.app.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "extends": "../tsconfig.json", - "compilerOptions": { - "outDir": "../out-tsc/app", - "baseUrl": "./", - "module": "es2015", - "types": [ - "node" - ] - }, - "exclude": [ - "karma.ts", - "**/*.spec.ts" - ] -} diff --git a/examples/composition/tsconfig.json b/examples/composition/tsconfig.json deleted file mode 100644 index 7b0d44572b22..000000000000 --- a/examples/composition/tsconfig.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "lerna": { - "disabled": true - }, - "compileOnSave": false, - "compilerOptions": { - "outDir": "./dist/out-tsc", - "sourceMap": true, - "moduleResolution": "node", - "emitDecoratorMetadata": true, - "experimentalDecorators": true, - "allowSyntheticDefaultImports": true, - "esModuleInterop": true, - "skipLibCheck": true, - "target": "es5", - "typeRoots": ["../../node_modules/@types", "node_modules/@types"], - "lib": ["es2017", "dom"] - } -} diff --git a/yarn.lock b/yarn.lock index 10e93bd5b8a7..1f45696f6f98 100644 --- a/yarn.lock +++ b/yarn.lock @@ -15784,43 +15784,6 @@ __metadata: languageName: node linkType: hard -"composition@workspace:examples/composition": - version: 0.0.0-use.local - resolution: "composition@workspace:examples/composition" - dependencies: - "@angular-devkit/build-angular": ~0.1102.13 - "@angular-devkit/core": ^11.2.13 - "@angular/cli": ^11.2.13 - "@angular/common": ^11.2.14 - "@angular/compiler": ^11.2.14 - "@angular/compiler-cli": ^11.2.14 - "@angular/core": ^11.2.14 - "@angular/forms": ^11.2.14 - "@angular/platform-browser": ^11.2.14 - "@angular/platform-browser-dynamic": ^11.2.14 - "@storybook/addon-jest": 6.4.0-alpha.6 - "@storybook/addon-links": 6.4.0-alpha.6 - "@storybook/addons": 6.4.0-alpha.6 - "@storybook/angular": 6.4.0-alpha.6 - "@storybook/source-loader": 6.4.0-alpha.6 - "@types/core-js": ^2.5.4 - "@types/jest": ^26.0.16 - "@types/node": ^14.14.20 - "@types/webpack-env": ^1.16.0 - "@webcomponents/custom-elements": ^1.4.3 - babel-plugin-require-context-hook: ^1.0.0 - core-js: ^3.8.2 - global: ^4.4.0 - node-sass: ^4.14.1 - rxjs: ^6.6.3 - storybook-addon-angular-ivy: ^0.0.1 - ts-jest: ^26.4.4 - ts-node: ^9.1.0 - typescript: ^4.1.3 - zone.js: ^0.11.3 - languageName: unknown - linkType: soft - "compressible@npm:~2.0.16": version: 2.0.18 resolution: "compressible@npm:2.0.18" From 0d54d345a8a6f5bd586c6f6a80fb1fa8b4215a16 Mon Sep 17 00:00:00 2001 From: Brett Upton Date: Fri, 9 Jul 2021 08:06:31 +0200 Subject: [PATCH 4/4] Changed composition titles --- examples/angular-cli/.storybook/main.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/angular-cli/.storybook/main.js b/examples/angular-cli/.storybook/main.js index 7602f927eb2d..c494920d567f 100644 --- a/examples/angular-cli/.storybook/main.js +++ b/examples/angular-cli/.storybook/main.js @@ -26,11 +26,11 @@ module.exports = { url: 'https://storybookjs.netlify.app/cra-ts-essentials', }, second: { - title: 'Composition test one', + title: 'Composition test two', url: 'https://storybookjs.netlify.app/cra-ts-essentials', }, third: { - title: 'Composition test one', + title: 'Composition test three', url: 'https://storybookjs.netlify.app/cra-ts-essentials', }, },