From 1ab9dad603f1477dc319b6ff1765766fff9d427b Mon Sep 17 00:00:00 2001 From: katerina Date: Tue, 22 Jun 2021 15:01:10 +0300 Subject: [PATCH] feat(storybook): removed addon-knobs and addon-controls from most places --- dep-graph/dep-graph/src/graphs/nx.ts | 6 +- e2e/angular/src/storybook.test.ts | 4 +- package.json | 2 - .../src/generators/init/init.spec.ts | 8 +- scripts/depcheck/missing.ts | 1 - yarn.lock | 81 ++----------------- 6 files changed, 16 insertions(+), 86 deletions(-) diff --git a/dep-graph/dep-graph/src/graphs/nx.ts b/dep-graph/dep-graph/src/graphs/nx.ts index 05fa5d59a4c002..6497ab7f0b6ca7 100644 --- a/dep-graph/dep-graph/src/graphs/nx.ts +++ b/dep-graph/dep-graph/src/graphs/nx.ts @@ -16557,12 +16557,12 @@ export const nxGraph: ProjectGraphCache = { files: [], }, }, - 'npm:@storybook/addon-knobs': { + 'npm:@storybook/addon-essentials': { type: 'npm', - name: 'npm:@storybook/addon-knobs', + name: 'npm:@storybook/addon-essentials', data: { version: '^6.0.21', - packageName: '@storybook/addon-knobs', + packageName: '@storybook/addon-essentials', files: [], }, }, diff --git a/e2e/angular/src/storybook.test.ts b/e2e/angular/src/storybook.test.ts index cd64e896ec2744..24000c2774bd41 100644 --- a/e2e/angular/src/storybook.test.ts +++ b/e2e/angular/src/storybook.test.ts @@ -34,8 +34,8 @@ describe('Storybook schematics', () => { ` module.exports = { stories: [], - addons: ['@storybook/addon-knobs/register'], - }; + addons: ['@storybook/addon-essentials'], + }; console.log('hi there'); ` diff --git a/package.json b/package.json index 824a3b4ce530f6..a4dd98f8d0fd68 100644 --- a/package.json +++ b/package.json @@ -79,9 +79,7 @@ "@rollup/plugin-json": "^4.1.0", "@rollup/plugin-node-resolve": "7.1.1", "@schematics/angular": "^12.0.0", - "@storybook/addon-controls": "^6.2.9", "@storybook/addon-essentials": "^6.2.9", - "@storybook/addon-knobs": "^6.2.9", "@storybook/angular": "^6.2.9", "@storybook/core": "^6.0.21", "@storybook/react": "^6.2.9", diff --git a/packages/storybook/src/generators/init/init.spec.ts b/packages/storybook/src/generators/init/init.spec.ts index 50a196c1d789fb..4e25f9a6175f93 100644 --- a/packages/storybook/src/generators/init/init.spec.ts +++ b/packages/storybook/src/generators/init/init.spec.ts @@ -33,7 +33,7 @@ describe('@nrwl/storybook:init', () => { expect(packageJson.dependencies[existing]).toBeDefined(); expect(packageJson.devDependencies[existing]).toBeDefined(); expect( - packageJson.devDependencies['@storybook/addon-knobs'] + packageJson.devDependencies['@storybook/addon-essentials'] ).toBeDefined(); // angular specific @@ -68,7 +68,7 @@ describe('@nrwl/storybook:init', () => { expect(packageJson.dependencies[existing]).toBeDefined(); expect(packageJson.devDependencies[existing]).toBeDefined(); expect( - packageJson.devDependencies['@storybook/addon-knobs'] + packageJson.devDependencies['@storybook/addon-essentials'] ).toBeDefined(); // react specific @@ -105,7 +105,9 @@ describe('@nrwl/storybook:init', () => { expect(packageJson.dependencies['@nrwl/storybook']).toBeUndefined(); expect(packageJson.dependencies[existing]).toBeDefined(); expect(packageJson.devDependencies[existing]).toBeDefined(); - expect(packageJson.devDependencies['@storybook/addon-knobs']).toBeDefined(); + expect( + packageJson.devDependencies['@storybook/addon-essentials'] + ).toBeDefined(); // react specific expect(packageJson.devDependencies['@storybook/react']).not.toBeDefined(); diff --git a/scripts/depcheck/missing.ts b/scripts/depcheck/missing.ts index ad23cf1feaffa5..743be25a1b233c 100644 --- a/scripts/depcheck/missing.ts +++ b/scripts/depcheck/missing.ts @@ -62,7 +62,6 @@ const IGNORE_MATCHES = { '@angular-devkit/architect', '@angular-devkit/core', '@angular-devkit/schematics', - '@storybook/addon-knobs', '@storybook/addon-essentials', '@storybook/core', 'rxjs', diff --git a/yarn.lock b/yarn.lock index 28918f34dab9b7..e2f8048ba94524 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2288,7 +2288,7 @@ dependencies: regenerator-runtime "^0.13.4" -"@babel/runtime@^7.1.2", "@babel/runtime@^7.10.2", "@babel/runtime@^7.11.2", "@babel/runtime@^7.12.1", "@babel/runtime@^7.12.5", "@babel/runtime@^7.13.8", "@babel/runtime@^7.3.1", "@babel/runtime@^7.4.4", "@babel/runtime@^7.5.0", "@babel/runtime@^7.5.5", "@babel/runtime@^7.7.2", "@babel/runtime@^7.7.6", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7": +"@babel/runtime@^7.1.2", "@babel/runtime@^7.10.2", "@babel/runtime@^7.11.2", "@babel/runtime@^7.12.1", "@babel/runtime@^7.12.5", "@babel/runtime@^7.13.8", "@babel/runtime@^7.3.1", "@babel/runtime@^7.5.0", "@babel/runtime@^7.5.5", "@babel/runtime@^7.7.2", "@babel/runtime@^7.7.6", "@babel/runtime@^7.8.4": version "7.13.10" resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.13.10.tgz#47d42a57b6095f4468da440388fdbad8bebf0d7d" integrity sha512-4QPkjJq6Ns3V/RgpEahRk+AGfL0eO6RHHtTWoNNr5mO49G6B5+X6d6THgWEAvTrznU5xYpbAlVKRYcsCgh/Akw== @@ -2569,7 +2569,7 @@ "@francoischalifour/autocomplete-preset-algolia" "^1.0.0-alpha.14" algoliasearch "^4.0.0" -"@emotion/cache@^10.0.27", "@emotion/cache@^10.0.9": +"@emotion/cache@^10.0.27": version "10.0.29" resolved "https://registry.yarnpkg.com/@emotion/cache/-/cache-10.0.29.tgz#87e7e64f412c060102d589fe7c6dc042e6f9d1e0" integrity sha512-fU2VtSVlHiF27empSbxi1O2JFdNWZO+2NFHfwO0pxgTep6Xa3uGb+3pVKfLww2l/IBGLNEZl5Xf/++A4wAYDYQ== @@ -2579,7 +2579,7 @@ "@emotion/utils" "0.11.3" "@emotion/weak-memoize" "0.2.5" -"@emotion/core@^10.0.9", "@emotion/core@^10.1.1": +"@emotion/core@^10.1.1": version "10.1.1" resolved "https://registry.yarnpkg.com/@emotion/core/-/core-10.1.1.tgz#c956c1365f2f2481960064bcb8c4732e5fb612c3" integrity sha512-ZMLG6qpXR8x031NXD8HJqugy/AZSkAuMxxqB46pmAR7ze47MhNJ56cdoX243QPZdGctrdfo+s08yZTiwaUcRKA== @@ -2591,7 +2591,7 @@ "@emotion/sheet" "0.9.4" "@emotion/utils" "0.11.3" -"@emotion/css@^10.0.27", "@emotion/css@^10.0.9": +"@emotion/css@^10.0.27": version "10.0.27" resolved "https://registry.yarnpkg.com/@emotion/css/-/css-10.0.27.tgz#3a7458198fbbebb53b01b2b87f64e5e21241e14c" integrity sha512-6wZjsvYeBhyZQYNrGoR5yPMYbMBNEnanDrqmsqS1mzDm1cOTu12shvl2j4QHNS36UaTE0USIJawCH9C8oW34Zw== @@ -3759,7 +3759,7 @@ ts-dedent "^2.0.0" util-deprecate "^1.0.2" -"@storybook/addon-controls@6.2.9", "@storybook/addon-controls@^6.2.9": +"@storybook/addon-controls@6.2.9": version "6.2.9" resolved "https://registry.yarnpkg.com/@storybook/addon-controls/-/addon-controls-6.2.9.tgz#eeec14b2946f1fb5326115f2205ed72c7f44ccea" integrity sha512-NvXAJ7I5U4CLxv4wL3/Ne9rehJlgnSmQlLIG/z6dg5zm7JIb48LT4IY6GzjlUP5LkjmO9KJ8gJC249uRt2iPBQ== @@ -3839,31 +3839,6 @@ regenerator-runtime "^0.13.7" ts-dedent "^2.0.0" -"@storybook/addon-knobs@^6.2.9": - version "6.2.9" - resolved "https://registry.yarnpkg.com/@storybook/addon-knobs/-/addon-knobs-6.2.9.tgz#879b2e3861c29b30b53f1d624315a2f3a463785a" - integrity sha512-ic3xXy9uWPfIGP4x3VuGnrUmg/Jn9rHKIqZMhRcC7mFDRVlgbekvQxaruC6VY9LW6o8jV/miReSZkJf7M8o0aQ== - dependencies: - "@storybook/addons" "6.2.9" - "@storybook/api" "6.2.9" - "@storybook/channels" "6.2.9" - "@storybook/client-api" "6.2.9" - "@storybook/components" "6.2.9" - "@storybook/core-events" "6.2.9" - "@storybook/theming" "6.2.9" - copy-to-clipboard "^3.3.1" - core-js "^3.8.2" - escape-html "^1.0.3" - fast-deep-equal "^3.1.3" - global "^4.4.0" - lodash "^4.17.20" - prop-types "^15.7.2" - qs "^6.10.0" - react-colorful "^5.0.1" - react-lifecycles-compat "^3.0.4" - react-select "^3.2.0" - regenerator-runtime "^0.13.7" - "@storybook/addon-toolbars@6.2.9": version "6.2.9" resolved "https://registry.yarnpkg.com/@storybook/addon-toolbars/-/addon-toolbars-6.2.9.tgz#29f2f4cba0bfbcff9424958eb573e537f7e2d5af" @@ -11234,14 +11209,6 @@ dom-converter@^0.2: dependencies: utila "~0.4" -dom-helpers@^5.0.1: - version "5.2.0" - resolved "https://registry.yarnpkg.com/dom-helpers/-/dom-helpers-5.2.0.tgz#57fd054c5f8f34c52a3eeffdb7e7e93cd357d95b" - integrity sha512-Ru5o9+V8CpunKnz5LGgWXkmrH/20cGKwcHwS4m73zIvs54CN9epEmT/HLqFJW3kXpakAFkEdzgy1hzlJe3E4OQ== - dependencies: - "@babel/runtime" "^7.8.7" - csstype "^3.0.2" - dom-serialize@^2.2.0: version "2.2.1" resolved "https://registry.yarnpkg.com/dom-serialize/-/dom-serialize-2.2.1.tgz#562ae8999f44be5ea3076f5419dcd59eb43ac95b" @@ -11854,7 +11821,7 @@ escalade@^3.0.2, escalade@^3.1.1: resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40" integrity sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw== -escape-html@^1.0.3, escape-html@~1.0.3: +escape-html@~1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988" integrity sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg= @@ -17248,11 +17215,6 @@ memfs@^3.1.2, memfs@^3.2.0: dependencies: fs-monkey "1.0.3" -memoize-one@^5.0.0: - version "5.1.1" - resolved "https://registry.yarnpkg.com/memoize-one/-/memoize-one-5.1.1.tgz#047b6e3199b508eaec03504de71229b8eb1d75c0" - integrity sha512-HKeeBpWvqiVJD57ZUAsJNm71eHTykffzcLZVYWiVfQeI1rJtuEaS7hQiEpWfVVk18donPwJEcFKIkCmPJNOhHA== - memoizee@0.4.15: version "0.4.15" resolved "https://registry.yarnpkg.com/memoizee/-/memoizee-0.4.15.tgz#e6f3d2da863f318d02225391829a6c5956555b72" @@ -21138,13 +21100,6 @@ react-hotkeys@2.0.0: dependencies: prop-types "^15.6.1" -react-input-autosize@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/react-input-autosize/-/react-input-autosize-3.0.0.tgz#6b5898c790d4478d69420b55441fcc31d5c50a85" - integrity sha512-nL9uS7jEs/zu8sqwFE5MAPx6pPkNAriACQ2rGLlqmKr2sPGtN7TXTyDdQt4lbNXVx7Uzadb40x8qotIuru6Rhg== - dependencies: - prop-types "^15.5.8" - react-inspector@^5.1.0: version "5.1.1" resolved "https://registry.yarnpkg.com/react-inspector/-/react-inspector-5.1.1.tgz#58476c78fde05d5055646ed8ec02030af42953c8" @@ -21261,20 +21216,6 @@ react-router@5.1.2: tiny-invariant "^1.0.2" tiny-warning "^1.0.0" -react-select@^3.2.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/react-select/-/react-select-3.2.0.tgz#de9284700196f5f9b5277c5d850a9ce85f5c72fe" - integrity sha512-B/q3TnCZXEKItO0fFN/I0tWOX3WJvi/X2wtdffmwSQVRwg5BpValScTO1vdic9AxlUgmeSzib2hAZAwIUQUZGQ== - dependencies: - "@babel/runtime" "^7.4.4" - "@emotion/cache" "^10.0.9" - "@emotion/core" "^10.0.9" - "@emotion/css" "^10.0.9" - memoize-one "^5.0.0" - prop-types "^15.6.0" - react-input-autosize "^3.0.0" - react-transition-group "^4.3.0" - react-sizeme@^2.6.7: version "2.6.12" resolved "https://registry.yarnpkg.com/react-sizeme/-/react-sizeme-2.6.12.tgz#ed207be5476f4a85bf364e92042520499455453e" @@ -21326,16 +21267,6 @@ react-textarea-autosize@^8.1.1, react-textarea-autosize@^8.3.0: use-composed-ref "^1.0.0" use-latest "^1.0.0" -react-transition-group@^4.3.0: - version "4.4.1" - resolved "https://registry.yarnpkg.com/react-transition-group/-/react-transition-group-4.4.1.tgz#63868f9325a38ea5ee9535d828327f85773345c9" - integrity sha512-Djqr7OQ2aPUiYurhPalTrVy9ddmFCCzwhqQmtN+J3+3DzLO209Fdr70QrN8Z3DsglWql6iY1lDWAfpFiBtuKGw== - dependencies: - "@babel/runtime" "^7.5.5" - dom-helpers "^5.0.1" - loose-envify "^1.4.0" - prop-types "^15.6.2" - react@16.14.0: version "16.14.0" resolved "https://registry.yarnpkg.com/react/-/react-16.14.0.tgz#94d776ddd0aaa37da3eda8fc5b6b18a4c9a3114d"