diff --git a/.eslintrc.js b/.eslintrc.js index c8c627ea8a08..b806b0000485 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -9,6 +9,18 @@ module.exports = { ], }, overrides: [ + { + // this package uses pre-bundling, dependencies will be bundled, and will be in devDepenencies + files: [ + '**/lib/theming/**/*', + '**/lib/router/**/*', + '**/lib/ui/**/*', + '**/lib/components/**/*', + ], + rules: { + 'import/no-extraneous-dependencies': ['error', { bundledDependencies: false }], + }, + }, { files: [ '**/__tests__/**', @@ -72,12 +84,5 @@ module.exports = { 'react/no-unknown-property': 'off', // Need to deactivate otherwise eslint replaces some unknown properties with React ones }, }, - { - // this package uses pre-bundling, dependencies will be bundled, and will be in devDepenencies - files: ['**/lib/theming/**/*', '**/lib/router/**/*', '**/lib/ui/**/*'], - rules: { - 'import/no-extraneous-dependencies': ['error', { bundledDependencies: false }], - }, - }, ], }; diff --git a/addons/storysource/package.json b/addons/storysource/package.json index e9a52caeef06..bd1485600880 100644 --- a/addons/storysource/package.json +++ b/addons/storysource/package.json @@ -57,7 +57,7 @@ "regenerator-runtime": "^0.13.7" }, "devDependencies": { - "@types/react": "^16.14.2", + "@types/react": "^16.14.23", "@types/react-syntax-highlighter": "^11.0.5" }, "peerDependencies": { diff --git a/app/angular/package.json b/app/angular/package.json index 65544a2c60ba..a6dfbed9e8cb 100644 --- a/app/angular/package.json +++ b/app/angular/package.json @@ -55,6 +55,8 @@ "@storybook/semver": "^7.3.2", "@storybook/store": "6.5.0-alpha.35", "@types/node": "^14.14.20 || ^16.0.0", + "@types/react": "^16.14.23", + "@types/react-dom": "^16.9.14", "@types/webpack-env": "^1.16.0", "autoprefixer": "^9.8.6", "core-js": "^3.8.2", @@ -64,8 +66,8 @@ "postcss": "^7.0.36", "postcss-loader": "^4.2.0", "raw-loader": "^4.0.2", - "react": "16.14.0", - "react-dom": "16.14.0", + "react": "^16.14.0", + "react-dom": "^16.14.0", "read-pkg-up": "^7.0.1", "regenerator-runtime": "^0.13.7", "sass-loader": "^10.1.0", diff --git a/examples/cra-ts-essentials/package.json b/examples/cra-ts-essentials/package.json index 02ec7b373f4f..8867c6e03b97 100644 --- a/examples/cra-ts-essentials/package.json +++ b/examples/cra-ts-essentials/package.json @@ -25,8 +25,8 @@ "dependencies": { "@types/jest": "^26.0.16", "@types/node": "^14.14.20 || ^16.0.0", - "@types/react": "^16.14.2", - "@types/react-dom": "16.9.10", + "@types/react": "^16.14.23", + "@types/react-dom": "^16.9.14", "global": "^4.4.0", "react": "16.14.0", "react-dom": "16.14.0", diff --git a/examples/cra-ts-kitchen-sink/package.json b/examples/cra-ts-kitchen-sink/package.json index aea41490a300..b9fe92846dc8 100644 --- a/examples/cra-ts-kitchen-sink/package.json +++ b/examples/cra-ts-kitchen-sink/package.json @@ -25,8 +25,8 @@ "dependencies": { "@types/jest": "25.2.3", "@types/node": "^14.14.20 || ^16.0.0", - "@types/react": "16.14.2", - "@types/react-dom": "16.9.10", + "@types/react": "^16.14.23", + "@types/react-dom": "^16.9.14", "prop-types": "^15.7.2", "react": "16.14.0", "react-dom": "16.14.0", diff --git a/examples/react-ts-webpack4/package.json b/examples/react-ts-webpack4/package.json index 51a9db0e9aec..6684da66f37f 100644 --- a/examples/react-ts-webpack4/package.json +++ b/examples/react-ts-webpack4/package.json @@ -12,8 +12,8 @@ "@storybook/addon-essentials": "6.5.0-alpha.35", "@storybook/builder-webpack4": "6.5.0-alpha.35", "@storybook/react": "6.5.0-alpha.35", - "@types/react": "^16.14.2", - "@types/react-dom": "^16.9.10", + "@types/react": "^16.14.23", + "@types/react-dom": "^16.9.14", "prop-types": "15.7.2", "react": "16.14.0", "react-dom": "16.14.0", diff --git a/examples/react-ts/package.json b/examples/react-ts/package.json index 386ef08815d3..43e8610a0d88 100644 --- a/examples/react-ts/package.json +++ b/examples/react-ts/package.json @@ -28,8 +28,8 @@ "@testing-library/dom": "^7.31.2", "@testing-library/user-event": "^13.1.9", "@types/babel__preset-env": "^7", - "@types/react": "^16.14.2", - "@types/react-dom": "^16.9.10", + "@types/react": "^16.14.23", + "@types/react-dom": "^16.9.14", "cross-env": "^7.0.3", "typescript": "^3.9.7", "webpack": "4" diff --git a/lib/cli/src/versions.ts b/lib/cli/src/versions.ts index 1bfad444fcc7..d679fcd38785 100644 --- a/lib/cli/src/versions.ts +++ b/lib/cli/src/versions.ts @@ -1,58 +1,58 @@ // auto generated file, do not edit export default { - "@storybook/addon-a11y": "6.5.0-alpha.35", - "@storybook/addon-actions": "6.5.0-alpha.35", - "@storybook/addon-backgrounds": "6.5.0-alpha.35", - "@storybook/addon-controls": "6.5.0-alpha.35", - "@storybook/addon-docs": "6.5.0-alpha.35", - "@storybook/addon-essentials": "6.5.0-alpha.35", - "@storybook/addon-interactions": "6.5.0-alpha.35", - "@storybook/addon-jest": "6.5.0-alpha.35", - "@storybook/addon-links": "6.5.0-alpha.35", - "@storybook/addon-measure": "6.5.0-alpha.35", - "@storybook/addon-outline": "6.5.0-alpha.35", - "@storybook/addon-storyshots": "6.5.0-alpha.35", - "@storybook/addon-storyshots-puppeteer": "6.5.0-alpha.35", - "@storybook/addon-storysource": "6.5.0-alpha.35", - "@storybook/addon-toolbars": "6.5.0-alpha.35", - "@storybook/addon-viewport": "6.5.0-alpha.35", - "@storybook/addons": "6.5.0-alpha.35", - "@storybook/angular": "6.5.0-alpha.35", - "@storybook/api": "6.5.0-alpha.35", - "@storybook/builder-webpack4": "6.5.0-alpha.35", - "@storybook/builder-webpack5": "6.5.0-alpha.35", - "@storybook/channel-postmessage": "6.5.0-alpha.35", - "@storybook/channel-websocket": "6.5.0-alpha.35", - "@storybook/channels": "6.5.0-alpha.35", - "@storybook/cli": "6.5.0-alpha.35", - "@storybook/client-api": "6.5.0-alpha.35", - "@storybook/client-logger": "6.5.0-alpha.35", - "@storybook/codemod": "6.5.0-alpha.35", - "@storybook/components": "6.5.0-alpha.35", - "@storybook/core": "6.5.0-alpha.35", - "@storybook/core-client": "6.5.0-alpha.35", - "@storybook/core-common": "6.5.0-alpha.35", - "@storybook/core-events": "6.5.0-alpha.35", - "@storybook/core-server": "6.5.0-alpha.35", - "@storybook/csf-tools": "6.5.0-alpha.35", - "@storybook/ember": "6.5.0-alpha.35", - "@storybook/html": "6.5.0-alpha.35", - "@storybook/instrumenter": "6.5.0-alpha.35", - "@storybook/manager-webpack4": "6.5.0-alpha.35", - "@storybook/manager-webpack5": "6.5.0-alpha.35", - "@storybook/node-logger": "6.5.0-alpha.35", - "@storybook/postinstall": "6.5.0-alpha.35", - "@storybook/preact": "6.5.0-alpha.35", - "@storybook/preview-web": "6.5.0-alpha.35", - "@storybook/react": "6.5.0-alpha.35", - "@storybook/router": "6.5.0-alpha.35", - "@storybook/server": "6.5.0-alpha.35", - "@storybook/source-loader": "6.5.0-alpha.35", - "@storybook/store": "6.5.0-alpha.35", - "@storybook/svelte": "6.5.0-alpha.35", - "@storybook/theming": "6.5.0-alpha.35", - "@storybook/ui": "6.5.0-alpha.35", - "@storybook/vue": "6.5.0-alpha.35", - "@storybook/vue3": "6.5.0-alpha.35", - "@storybook/web-components": "6.5.0-alpha.35" -} \ No newline at end of file + '@storybook/addon-a11y': '6.5.0-alpha.35', + '@storybook/addon-actions': '6.5.0-alpha.35', + '@storybook/addon-backgrounds': '6.5.0-alpha.35', + '@storybook/addon-controls': '6.5.0-alpha.35', + '@storybook/addon-docs': '6.5.0-alpha.35', + '@storybook/addon-essentials': '6.5.0-alpha.35', + '@storybook/addon-interactions': '6.5.0-alpha.35', + '@storybook/addon-jest': '6.5.0-alpha.35', + '@storybook/addon-links': '6.5.0-alpha.35', + '@storybook/addon-measure': '6.5.0-alpha.35', + '@storybook/addon-outline': '6.5.0-alpha.35', + '@storybook/addon-storyshots': '6.5.0-alpha.35', + '@storybook/addon-storyshots-puppeteer': '6.5.0-alpha.35', + '@storybook/addon-storysource': '6.5.0-alpha.35', + '@storybook/addon-toolbars': '6.5.0-alpha.35', + '@storybook/addon-viewport': '6.5.0-alpha.35', + '@storybook/addons': '6.5.0-alpha.35', + '@storybook/angular': '6.5.0-alpha.35', + '@storybook/api': '6.5.0-alpha.35', + '@storybook/builder-webpack4': '6.5.0-alpha.35', + '@storybook/builder-webpack5': '6.5.0-alpha.35', + '@storybook/channel-postmessage': '6.5.0-alpha.35', + '@storybook/channel-websocket': '6.5.0-alpha.35', + '@storybook/channels': '6.5.0-alpha.35', + '@storybook/cli': '6.5.0-alpha.35', + '@storybook/client-api': '6.5.0-alpha.35', + '@storybook/client-logger': '6.5.0-alpha.35', + '@storybook/codemod': '6.5.0-alpha.35', + '@storybook/components': '6.5.0-alpha.35', + '@storybook/core': '6.5.0-alpha.35', + '@storybook/core-client': '6.5.0-alpha.35', + '@storybook/core-common': '6.5.0-alpha.35', + '@storybook/core-events': '6.5.0-alpha.35', + '@storybook/core-server': '6.5.0-alpha.35', + '@storybook/csf-tools': '6.5.0-alpha.35', + '@storybook/ember': '6.5.0-alpha.35', + '@storybook/html': '6.5.0-alpha.35', + '@storybook/instrumenter': '6.5.0-alpha.35', + '@storybook/manager-webpack4': '6.5.0-alpha.35', + '@storybook/manager-webpack5': '6.5.0-alpha.35', + '@storybook/node-logger': '6.5.0-alpha.35', + '@storybook/postinstall': '6.5.0-alpha.35', + '@storybook/preact': '6.5.0-alpha.35', + '@storybook/preview-web': '6.5.0-alpha.35', + '@storybook/react': '6.5.0-alpha.35', + '@storybook/router': '6.5.0-alpha.35', + '@storybook/server': '6.5.0-alpha.35', + '@storybook/source-loader': '6.5.0-alpha.35', + '@storybook/store': '6.5.0-alpha.35', + '@storybook/svelte': '6.5.0-alpha.35', + '@storybook/theming': '6.5.0-alpha.35', + '@storybook/ui': '6.5.0-alpha.35', + '@storybook/vue': '6.5.0-alpha.35', + '@storybook/vue3': '6.5.0-alpha.35', + '@storybook/web-components': '6.5.0-alpha.35', +}; diff --git a/lib/components/package.json b/lib/components/package.json index c89fb0b5f3d5..c3a00a843268 100644 --- a/lib/components/package.json +++ b/lib/components/package.json @@ -37,20 +37,25 @@ "*.d.ts" ], "scripts": { - "prepare": "node ../../scripts/prepare.js" + "prepare": "ts-node ../../scripts/prebundle.ts" }, "dependencies": { - "@popperjs/core": "^2.6.0", "@storybook/client-logger": "6.5.0-alpha.35", "@storybook/csf": "0.0.2--canary.87bc651.0", "@storybook/theming": "6.5.0-alpha.35", + "core-js": "^3.8.2", + "regenerator-runtime": "^0.13.7" + }, + "devDependencies": { + "@popperjs/core": "^2.6.0", "@types/color-convert": "^2.0.0", "@types/overlayscrollbars": "^1.12.0", "@types/react-syntax-highlighter": "11.0.5", "color-convert": "^2.0.1", - "core-js": "^3.8.2", + "css": "^3.0.0", "fast-deep-equal": "^3.1.3", "global": "^4.4.0", + "jest": "^26.6.3", "lodash": "^4.17.21", "markdown-to-jsx": "^7.1.3", "memoizerific": "^1.11.3", @@ -62,14 +67,10 @@ "react-popper-tooltip": "^3.1.1", "react-syntax-highlighter": "^15.4.5", "react-textarea-autosize": "^8.3.0", - "regenerator-runtime": "^0.13.7", "ts-dedent": "^2.0.0", + "ts-node": "^10.4.0", "util-deprecate": "^1.0.2" }, - "devDependencies": { - "css": "^3.0.0", - "jest": "^26.6.3" - }, "peerDependencies": { "react": "^16.8.0 || ^17.0.0", "react-dom": "^16.8.0 || ^17.0.0" @@ -77,6 +78,7 @@ "publishConfig": { "access": "public" }, - "gitHead": "7a483e312a7355fc0408a578bfc16d4e476b0938", + "bundlerEntrypoint": "./src/index.ts", + "gitHead": "5eafd588972634b4d76ca2ebf01bd5ca2aaa0119", "sbmodern": "dist/modern/index.js" } diff --git a/lib/components/src/index.ts b/lib/components/src/index.ts index 693104e6de42..885b3edb087b 100644 --- a/lib/components/src/index.ts +++ b/lib/components/src/index.ts @@ -1,3 +1,6 @@ +// eslint-disable-next-line @typescript-eslint/triple-slash-reference +/// + import { createElement, forwardRef, ElementType } from 'react'; import * as typography from './typography/components'; diff --git a/lib/theming/src/index.ts b/lib/theming/src/index.ts index 6b58d0f9b640..02a23b7dc204 100644 --- a/lib/theming/src/index.ts +++ b/lib/theming/src/index.ts @@ -2,15 +2,19 @@ /// import emotionStyled, { CreateStyled } from '@emotion/styled'; + import { Theme } from './types'; +export type { StyledComponent } from '@emotion/styled'; +export { Global, keyframes, css, jsx, ClassNames } from '@emotion/core'; +export type { CSSObject, Keyframes } from '@emotion/core'; + export const styled = emotionStyled as CreateStyled; export * from './base'; export * from './types'; -export * from '@emotion/core'; -export * from 'emotion-theming'; +export { withTheme, useTheme, ThemeProvider } from 'emotion-theming'; export { default as isPropValid } from '@emotion/is-prop-valid'; export { createGlobal, createReset } from './global'; diff --git a/lib/ui/src/components/layout/desktop.stories.tsx b/lib/ui/src/components/layout/desktop.stories.tsx index 7c1af81fceae..72e5979292c3 100644 --- a/lib/ui/src/components/layout/desktop.stories.tsx +++ b/lib/ui/src/components/layout/desktop.stories.tsx @@ -1,4 +1,3 @@ -/* eslint-disable import/no-extraneous-dependencies */ import React, { Fragment } from 'react'; import type { DecoratorFn } from '@storybook/react'; diff --git a/lib/ui/src/components/panel/panel.stories.tsx b/lib/ui/src/components/panel/panel.stories.tsx index 7aa003b56a1e..ffe5de78dd72 100644 --- a/lib/ui/src/components/panel/panel.stories.tsx +++ b/lib/ui/src/components/panel/panel.stories.tsx @@ -1,4 +1,3 @@ -/* eslint-disable import/no-extraneous-dependencies */ import React from 'react'; import { action } from '@storybook/addon-actions'; import Panel from './panel'; diff --git a/lib/ui/src/components/preview/preview.stories.tsx b/lib/ui/src/components/preview/preview.stories.tsx index 6644026cd514..5c8437bfb1b0 100644 --- a/lib/ui/src/components/preview/preview.stories.tsx +++ b/lib/ui/src/components/preview/preview.stories.tsx @@ -1,4 +1,3 @@ -/* eslint-disable import/no-extraneous-dependencies */ import React from 'react'; import { parsePath, createPath } from 'history'; diff --git a/lib/ui/src/components/sidebar/Heading.stories.tsx b/lib/ui/src/components/sidebar/Heading.stories.tsx index 93da8b633384..6d874e7438b7 100644 --- a/lib/ui/src/components/sidebar/Heading.stories.tsx +++ b/lib/ui/src/components/sidebar/Heading.stories.tsx @@ -1,4 +1,3 @@ -/* eslint-disable import/no-extraneous-dependencies */ /* eslint-disable storybook/use-storybook-testing-library */ // @TODO: use addon-interactions and remove the rule disable above import React from 'react'; diff --git a/lib/ui/src/components/sidebar/Search.stories.tsx b/lib/ui/src/components/sidebar/Search.stories.tsx index d1842e7d3ffd..e455be783db0 100644 --- a/lib/ui/src/components/sidebar/Search.stories.tsx +++ b/lib/ui/src/components/sidebar/Search.stories.tsx @@ -1,4 +1,3 @@ -/* eslint-disable import/no-extraneous-dependencies */ import React from 'react'; import { action } from '@storybook/addon-actions'; diff --git a/lib/ui/src/components/sidebar/Tree.stories.tsx b/lib/ui/src/components/sidebar/Tree.stories.tsx index 393d49340da1..9b8e486b26df 100644 --- a/lib/ui/src/components/sidebar/Tree.stories.tsx +++ b/lib/ui/src/components/sidebar/Tree.stories.tsx @@ -1,4 +1,3 @@ -/* eslint-disable import/no-extraneous-dependencies */ /* eslint-disable storybook/use-storybook-testing-library */ // @TODO: use addon-interactions and remove the rule disable above import React from 'react'; diff --git a/lib/ui/src/settings/SettingsFooter.stories.tsx b/lib/ui/src/settings/SettingsFooter.stories.tsx index db697898d33c..fb0fb3a2cf53 100644 --- a/lib/ui/src/settings/SettingsFooter.stories.tsx +++ b/lib/ui/src/settings/SettingsFooter.stories.tsx @@ -1,4 +1,3 @@ -/* eslint-disable import/no-extraneous-dependencies */ import React from 'react'; import { DecoratorFn } from '@storybook/react'; diff --git a/lib/ui/src/settings/about.stories.js b/lib/ui/src/settings/about.stories.js index 586b251ba4cb..552bf4b2cd1d 100644 --- a/lib/ui/src/settings/about.stories.js +++ b/lib/ui/src/settings/about.stories.js @@ -1,4 +1,3 @@ -/* eslint-disable import/no-extraneous-dependencies */ import React from 'react'; import { storiesOf } from '@storybook/react'; import { actions as createActions } from '@storybook/addon-actions'; diff --git a/lib/ui/src/settings/release_notes.stories.tsx b/lib/ui/src/settings/release_notes.stories.tsx index 32f7d2f778c0..157285047624 100644 --- a/lib/ui/src/settings/release_notes.stories.tsx +++ b/lib/ui/src/settings/release_notes.stories.tsx @@ -1,4 +1,3 @@ -/* eslint-disable import/no-extraneous-dependencies */ import React from 'react'; import { actions as makeActions } from '@storybook/addon-actions'; diff --git a/lib/ui/src/settings/shortcuts.stories.tsx b/lib/ui/src/settings/shortcuts.stories.tsx index c2eebed053b4..85b8c59985ab 100644 --- a/lib/ui/src/settings/shortcuts.stories.tsx +++ b/lib/ui/src/settings/shortcuts.stories.tsx @@ -1,4 +1,3 @@ -/* eslint-disable import/no-extraneous-dependencies */ import React from 'react'; import { actions as makeActions } from '@storybook/addon-actions'; diff --git a/package.json b/package.json index 0c10d7398271..9ea1d9f40140 100644 --- a/package.json +++ b/package.json @@ -202,8 +202,8 @@ "@types/node": "^14.14.20 || ^16.0.0", "@types/node-cleanup": "^2.1.1", "@types/prompts": "2.0.11", - "@types/react": "^16", - "@types/react-dom": "^16", + "@types/react": "^16.14.23", + "@types/react-dom": "^16.9.14", "@types/semver": "^7.3.4", "@types/serve-static": "^1.13.8", "@types/shelljs": "^0.8.7", @@ -278,6 +278,7 @@ "remark-lint": "^8.0.0", "remark-preset-lint-recommended": "^5.0.0", "rollup": "^2.60.2", + "rollup-plugin-extensions": "^0.1.0", "rollup-plugin-jsx": "^1.0.3", "rollup-plugin-terser": "^7.0.2", "serve-static": "^1.14.1", diff --git a/scripts/bundle-package.ts b/scripts/bundle-package.ts index bcf6852e3c06..d346b0c2e9e4 100644 --- a/scripts/bundle-package.ts +++ b/scripts/bundle-package.ts @@ -160,7 +160,7 @@ async function dts({ input, externals, cwd, ...options }: Options) { await dtsLozalize.run([bundledDTSfile], localizedDTSout, { externals, cwd }); - await fs.remove(path.join(cwd, 'dist/ts-tmp')); + // await fs.remove(path.join(cwd, 'dist/ts-tmp')); await execa('node', [ path.join(__dirname, '../node_modules/.bin/downlevel-dts'), diff --git a/scripts/dts-localize.ts b/scripts/dts-localize.ts index 25548196476a..7c12200d9c57 100644 --- a/scripts/dts-localize.ts +++ b/scripts/dts-localize.ts @@ -235,7 +235,7 @@ export const run = async (entrySourceFiles: string[], outputPath: string, option function getSourceFile(moduleNode: ts.Node) { while (!ts.isSourceFile(moduleNode)) { - moduleNode = moduleNode.parent; + moduleNode = moduleNode.getSourceFile(); } return moduleNode; } @@ -271,6 +271,7 @@ export const run = async (entrySourceFiles: string[], outputPath: string, option // I could create the dependency graph myself, perhaps that'd be better, but I'm OK with this for now. if (sourceFile.resolvedModules && sourceFile.resolvedModules.size > 0) { Array.from(sourceFile.resolvedModules.entries()).forEach(([k, v]) => { + // console.log({ k }, v.resolvedFileName); if (externals.includes(k)) { return; } diff --git a/yarn.lock b/yarn.lock index 657f99c0fb25..218185a98e28 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6853,7 +6853,7 @@ __metadata: "@storybook/router": 6.5.0-alpha.35 "@storybook/source-loader": 6.5.0-alpha.35 "@storybook/theming": 6.5.0-alpha.35 - "@types/react": ^16.14.2 + "@types/react": ^16.14.23 "@types/react-syntax-highlighter": ^11.0.5 core-js: ^3.8.2 estraverse: ^5.2.0 @@ -6991,6 +6991,8 @@ __metadata: "@types/autoprefixer": ^9.7.2 "@types/jest": ^26.0.16 "@types/node": ^14.14.20 || ^16.0.0 + "@types/react": ^16.14.23 + "@types/react-dom": ^16.9.14 "@types/webpack-env": ^1.16.0 autoprefixer: ^9.8.6 core-js: ^3.8.2 @@ -7002,8 +7004,8 @@ __metadata: postcss: ^7.0.36 postcss-loader: ^4.2.0 raw-loader: ^4.0.2 - react: 16.14.0 - react-dom: 16.14.0 + react: ^16.14.0 + react-dom: ^16.14.0 read-pkg-up: ^7.0.1 regenerator-runtime: ^0.13.7 sass-loader: ^10.1.0 @@ -7468,6 +7470,7 @@ __metadata: react-textarea-autosize: ^8.3.0 regenerator-runtime: ^0.13.7 ts-dedent: ^2.0.0 + ts-node: ^10.4.0 util-deprecate: ^1.0.2 peerDependencies: react: ^16.8.0 || ^17.0.0 @@ -7805,8 +7808,8 @@ __metadata: "@storybook/addon-essentials": 6.5.0-alpha.35 "@storybook/builder-webpack4": 6.5.0-alpha.35 "@storybook/react": 6.5.0-alpha.35 - "@types/react": ^16.14.2 - "@types/react-dom": ^16.9.10 + "@types/react": ^16.14.23 + "@types/react-dom": ^16.9.14 prop-types: 15.7.2 react: 16.14.0 react-dom: 16.14.0 @@ -7832,8 +7835,8 @@ __metadata: "@testing-library/dom": ^7.31.2 "@testing-library/user-event": ^13.1.9 "@types/babel__preset-env": ^7 - "@types/react": ^16.14.2 - "@types/react-dom": ^16.9.10 + "@types/react": ^16.14.23 + "@types/react-dom": ^16.9.14 cross-env: ^7.0.3 formik: ^2.2.9 prop-types: 15.7.2 @@ -8340,8 +8343,8 @@ __metadata: "@types/node": ^14.14.20 || ^16.0.0 "@types/node-cleanup": ^2.1.1 "@types/prompts": 2.0.11 - "@types/react": ^16 - "@types/react-dom": ^16 + "@types/react": ^16.14.23 + "@types/react-dom": ^16.9.14 "@types/semver": ^7.3.4 "@types/serve-static": ^1.13.8 "@types/shelljs": ^0.8.7 @@ -8418,6 +8421,7 @@ __metadata: remark-lint: ^8.0.0 remark-preset-lint-recommended: ^5.0.0 rollup: ^2.60.2 + rollup-plugin-extensions: ^0.1.0 rollup-plugin-jsx: ^1.0.3 rollup-plugin-terser: ^7.0.2 serve-static: ^1.14.1 @@ -10094,16 +10098,7 @@ __metadata: languageName: node linkType: hard -"@types/react-dom@npm:16.9.10": - version: 16.9.10 - resolution: "@types/react-dom@npm:16.9.10" - dependencies: - "@types/react": ^16 - checksum: a04cb6a9fce8153f12f1f93897fc083c47fe8d7bc0a027c266b12740f2551f215e45b430ddfb42c6ac8aa99591492150bf660dc698f4706e0dd76210d2773080 - languageName: node - linkType: hard - -"@types/react-dom@npm:^16, @types/react-dom@npm:^16.9.10": +"@types/react-dom@npm:^16.9.14": version: 16.9.14 resolution: "@types/react-dom@npm:16.9.14" dependencies: @@ -10130,24 +10125,14 @@ __metadata: languageName: node linkType: hard -"@types/react@npm:*, @types/react@npm:^16, @types/react@npm:^16.14.2": - version: 16.14.22 - resolution: "@types/react@npm:16.14.22" +"@types/react@npm:*, @types/react@npm:^16, @types/react@npm:^16.14.23": + version: 16.14.23 + resolution: "@types/react@npm:16.14.23" dependencies: "@types/prop-types": "*" "@types/scheduler": "*" csstype: ^3.0.2 - checksum: 6ada83210314222bb783b57cc75b1beeb137740445d5774d2dc8ac18f3ccbb245818d87c693d855247a6efa0515453bc7882a64b28ce5ea69bd37f962cc43ab4 - languageName: node - linkType: hard - -"@types/react@npm:16.14.2": - version: 16.14.2 - resolution: "@types/react@npm:16.14.2" - dependencies: - "@types/prop-types": "*" - csstype: ^3.0.2 - checksum: cdaa102b305773bc7a55fb2314f9fea65cf4e7155d15e2991fc554e50a0fa966780552b6c65d74b27cf15a021b28191ed58d2a691d4b0c0a1a82b1473d67b4b5 + checksum: e6e1432980f0904faa1527288f8c2d4c0f36f9398302f7afa906ce3f0d2c6ca5ae06f33b375a307221808a003edbcda62b94b1885cda701855208ff8555b996b languageName: node linkType: hard @@ -17786,8 +17771,8 @@ __metadata: "@storybook/react": 6.5.0-alpha.35 "@types/jest": ^26.0.16 "@types/node": ^14.14.20 || ^16.0.0 - "@types/react": ^16.14.2 - "@types/react-dom": 16.9.10 + "@types/react": ^16.14.23 + "@types/react-dom": ^16.9.14 global: ^4.4.0 react: 16.14.0 react-dom: 16.14.0 @@ -17813,8 +17798,8 @@ __metadata: "@types/enzyme": ^3.10.8 "@types/jest": 25.2.3 "@types/node": ^14.14.20 || ^16.0.0 - "@types/react": 16.14.2 - "@types/react-dom": 16.9.10 + "@types/react": ^16.14.23 + "@types/react-dom": ^16.9.14 enzyme: ^3.11.0 enzyme-adapter-react-16: ^1.9.1 enzyme-to-json: ^3.6.1 @@ -37238,7 +37223,7 @@ __metadata: languageName: node linkType: hard -"react-dom@npm:16.14.0": +"react-dom@npm:16.14.0, react-dom@npm:^16.14.0": version: 16.14.0 resolution: "react-dom@npm:16.14.0" dependencies: @@ -37767,7 +37752,7 @@ __metadata: languageName: node linkType: hard -"react@npm:16.14.0, react@npm:^16.2.0": +"react@npm:16.14.0, react@npm:^16.14.0, react@npm:^16.2.0": version: 16.14.0 resolution: "react@npm:16.14.0" dependencies: @@ -39524,6 +39509,15 @@ __metadata: languageName: node linkType: hard +"rollup-plugin-extensions@npm:^0.1.0": + version: 0.1.0 + resolution: "rollup-plugin-extensions@npm:0.1.0" + peerDependencies: + rollup: ^1.4.1 + checksum: 1d08385299b3936074dacb837ba154b7ead4b5612c0fdc6b40e227987f5cdd1ea7652bfd81b867f7a77e5f100638862d1778b4bf6519027d573bf7dbad86f666 + languageName: node + linkType: hard + "rollup-plugin-jsx@npm:^1.0.3": version: 1.0.3 resolution: "rollup-plugin-jsx@npm:1.0.3" @@ -39611,8 +39605,8 @@ __metadata: linkType: hard "rollup@npm:^2.60.2": - version: 2.64.0 - resolution: "rollup@npm:2.64.0" + version: 2.66.1 + resolution: "rollup@npm:2.66.1" dependencies: fsevents: ~2.3.2 dependenciesMeta: @@ -39620,7 +39614,7 @@ __metadata: optional: true bin: rollup: dist/bin/rollup - checksum: 22d8893e359ae9ed0eb599050276805e1b27ed22adfdcf06f6ad0f7a5d0f40e93e888a1dd6053709f1e8338f29ddbc1e6eab2fe0237c81dd1acad1f6bbb463e4 + checksum: 7b39c30fef30877009e21109fb7da0c4c8b136f61f9268f747b373dc13a53c4878f1c1f78aa5cc4619012af62770c6638b1990fb22f00efe0faad65ccd216247 languageName: node linkType: hard @@ -43735,13 +43729,13 @@ __metadata: languageName: node linkType: hard -"typescript@npm:>=3.0.1": - version: 4.5.4 - resolution: "typescript@npm:4.5.4" +"typescript@npm:>=3.0.1, typescript@npm:^4.0.3, typescript@npm:^4.1.0-dev.20200804, typescript@npm:^4.1.3": + version: 4.5.5 + resolution: "typescript@npm:4.5.5" bin: tsc: bin/tsc tsserver: bin/tsserver - checksum: 4dccd6947e632cc0070653788a3a81051825e9a7acd4c3586124e5a145148bb57b0a401b81d220ac1eb7742a29d5d22fd35af033f839daa60738c3e4fecb5850 + checksum: ac15b92f3dcd9a4233cab288a913ccbd96729fc488181396fa93c0297ccef3cd3c2f9a7a63340efb0d07bff3d5026028fc81b9c1ef08076029e057081eb5884b languageName: node linkType: hard @@ -43755,16 +43749,6 @@ __metadata: languageName: node linkType: hard -"typescript@npm:^4.0.3, typescript@npm:^4.1.0-dev.20200804, typescript@npm:^4.1.3": - version: 4.5.5 - resolution: "typescript@npm:4.5.5" - bin: - tsc: bin/tsc - tsserver: bin/tsserver - checksum: ac15b92f3dcd9a4233cab288a913ccbd96729fc488181396fa93c0297ccef3cd3c2f9a7a63340efb0d07bff3d5026028fc81b9c1ef08076029e057081eb5884b - languageName: node - linkType: hard - "typescript@patch:typescript@4.1.5#~builtin": version: 4.1.5 resolution: "typescript@patch:typescript@npm%3A4.1.5#~builtin::version=4.1.5&hash=493e53" @@ -43775,13 +43759,13 @@ __metadata: languageName: node linkType: hard -"typescript@patch:typescript@>=3.0.1#~builtin": - version: 4.5.4 - resolution: "typescript@patch:typescript@npm%3A4.5.4#~builtin::version=4.5.4&hash=493e53" +"typescript@patch:typescript@>=3.0.1#~builtin, typescript@patch:typescript@^4.0.3#~builtin, typescript@patch:typescript@^4.1.0-dev.20200804#~builtin, typescript@patch:typescript@^4.1.3#~builtin": + version: 4.5.5 + resolution: "typescript@patch:typescript@npm%3A4.5.5#~builtin::version=4.5.5&hash=493e53" bin: tsc: bin/tsc tsserver: bin/tsserver - checksum: 7e9541c322d8e72164763c5ccb13e6f8534124a5917b697500033c9437e23c81bfdb0e14c9d4dd8cbe9ad78ea605e91eef02f9ee6f94d9f8130ac4846664e31c + checksum: 6a8888c9fe41d0a19324125c636b1adb9ec5c984342fc7a26f2a389a432a94639c24b72e6e019ffbbb03cb614c1f008b4c31e48fb560b772e45e6581265c500b languageName: node linkType: hard @@ -43795,16 +43779,6 @@ __metadata: languageName: node linkType: hard -"typescript@patch:typescript@^4.0.3#~builtin, typescript@patch:typescript@^4.1.0-dev.20200804#~builtin, typescript@patch:typescript@^4.1.3#~builtin": - version: 4.5.5 - resolution: "typescript@patch:typescript@npm%3A4.5.5#~builtin::version=4.5.5&hash=493e53" - bin: - tsc: bin/tsc - tsserver: bin/tsserver - checksum: 6a8888c9fe41d0a19324125c636b1adb9ec5c984342fc7a26f2a389a432a94639c24b72e6e019ffbbb03cb614c1f008b4c31e48fb560b772e45e6581265c500b - languageName: node - linkType: hard - "ua-parser-js@npm:^0.7.30": version: 0.7.31 resolution: "ua-parser-js@npm:0.7.31"