diff --git a/packages/cli/create-strapi-app/package.json b/packages/cli/create-strapi-app/package.json index 6aedaae508..6a390b6842 100644 --- a/packages/cli/create-strapi-app/package.json +++ b/packages/cli/create-strapi-app/package.json @@ -40,7 +40,7 @@ "dependencies": { "@strapi/generate-new": "4.2.2", "commander": "6.1.0", - "inquirer": "8.2.0" + "inquirer": "8.2.4" }, "engines": { "node": ">=14.19.1 <=16.x.x", diff --git a/packages/cli/create-strapi-starter/package.json b/packages/cli/create-strapi-starter/package.json index 57646fa6e3..2dee086536 100644 --- a/packages/cli/create-strapi-starter/package.json +++ b/packages/cli/create-strapi-starter/package.json @@ -44,7 +44,7 @@ "commander": "7.1.0", "execa": "5.1.1", "fs-extra": "10.0.0", - "inquirer": "8.2.0", + "inquirer": "8.2.4", "ora": "5.4.0" }, "engines": { diff --git a/packages/core/admin/admin/src/content-manager/components/EditViewDataManagerProvider/index.js b/packages/core/admin/admin/src/content-manager/components/EditViewDataManagerProvider/index.js index c8dc356f04..edb52a3e9e 100644 --- a/packages/core/admin/admin/src/content-manager/components/EditViewDataManagerProvider/index.js +++ b/packages/core/admin/admin/src/content-manager/components/EditViewDataManagerProvider/index.js @@ -233,9 +233,13 @@ const EditViewDataManagerProvider = ({ ({ target: { name, value, type } }, shouldSetInitialValue = false) => { let inputValue = value; - // Empty string is not a valid date, - // Set the date to null when it's empty - if (type === 'date' && value === '') { + // Allow to reset text, textarea, email, uid, select/enum, and number + if ( + ['text', 'textarea', 'string', 'email', 'uid', 'select', 'select-one', 'number'].includes( + type + ) && + !value + ) { inputValue = null; } @@ -248,16 +252,6 @@ const EditViewDataManagerProvider = ({ return; } - // Allow to reset enum - if (type === 'select-one' && value === '') { - inputValue = null; - } - - // Allow to reset number input - if (type === 'number' && value === '') { - inputValue = null; - } - dispatch({ type: 'ON_CHANGE', keys: name.split('.'), diff --git a/packages/core/admin/admin/src/content-manager/components/EditViewDataManagerProvider/utils/cleanData.js b/packages/core/admin/admin/src/content-manager/components/EditViewDataManagerProvider/utils/cleanData.js index dfb777237f..acad9034e3 100644 --- a/packages/core/admin/admin/src/content-manager/components/EditViewDataManagerProvider/utils/cleanData.js +++ b/packages/core/admin/admin/src/content-manager/components/EditViewDataManagerProvider/utils/cleanData.js @@ -57,6 +57,7 @@ const cleanData = (retrievedData, currentSchema, componentsSchema) => { } else { cleanedData = value ? recursiveCleanData(value, componentsSchema[component]) : value; } + break; case 'dynamiczone': cleanedData = value.map(componentData => { diff --git a/packages/core/admin/admin/src/content-manager/components/EditViewDataManagerProvider/utils/tests/cleanData.test.js b/packages/core/admin/admin/src/content-manager/components/EditViewDataManagerProvider/utils/tests/cleanData.test.js new file mode 100644 index 0000000000..6a7ae65ae9 --- /dev/null +++ b/packages/core/admin/admin/src/content-manager/components/EditViewDataManagerProvider/utils/tests/cleanData.test.js @@ -0,0 +1,185 @@ +import cleanData from '../cleanData'; + +describe('CM || components || EditViewDataManagerProvider || utils || cleanData', () => { + test('should parse json value', () => { + const result = cleanData( + { + jsonTest: '{\n "cat": "michka"\n}', + }, + { + attributes: { + jsonTest: { + type: 'json', + }, + }, + }, + {} + ); + + const expected = { + jsonTest: { cat: 'michka' }, + }; + + expect(result).toEqual(expected); + }); + + test('should parse time value', () => { + const result = cleanData( + { + timeTest: '11:38', + }, + { + attributes: { + timeTest: { + type: 'time', + }, + }, + }, + {} + ); + + const expected = { + timeTest: '11:38:00', + }; + + expect(result).toEqual(expected); + }); + + test('should parse media value by multiple type', () => { + const result = cleanData( + { + singleMediaTest: { + id: 60, + name: 'cat.png', + url: '/uploads/cat.png', + }, + multipleMediaTest: [ + { + id: 52, + name: 'cat.png', + url: '/uploads/cat.png', + }, + { + id: 58, + name: 'cat.png', + url: '/uploads/cat.png', + }, + ], + }, + { + attributes: { + singleMediaTest: { + type: 'media', + multiple: false, + }, + multipleMediaTest: { + type: 'media', + multiple: true, + }, + }, + }, + {} + ); + + const expected = { + singleMediaTest: 60, + multipleMediaTest: [ + { id: 52, name: 'cat.png', url: '/uploads/cat.png' }, + { id: 58, name: 'cat.png', url: '/uploads/cat.png' }, + ], + }; + + expect(result).toEqual(expected); + }); + + test('should parse component values recursively', () => { + const result = cleanData( + { + singleComponentTest: { + name: 'single', + time: '11:38', + }, + repComponentTest: [ + { + name: 'rep1', + time: '11:39', + }, + { + name: 'rep2', + time: '11:40', + }, + ], + }, + { + attributes: { + singleComponentTest: { + type: 'component', + repeatable: false, + component: 'basic.rep', + }, + repComponentTest: { + type: 'component', + repeatable: true, + component: 'basic.rep', + }, + }, + }, + { + 'basic.rep': { + attributes: { + name: { + type: 'string', + }, + time: { + type: 'time', + }, + }, + }, + } + ); + + const expected = { + singleComponentTest: { name: 'single', time: '11:38:00' }, + repComponentTest: [ + { name: 'rep1', time: '11:39:00' }, + { name: 'rep2', time: '11:40:00' }, + ], + }; + + expect(result).toEqual(expected); + }); + + test('should parse dynamic zone values recursively', () => { + const result = cleanData( + { + dynamicZoneTest: [ + { + __component: 'basic.rep', + time: '00:02', + }, + ], + }, + { + attributes: { + dynamicZoneTest: { + type: 'dynamiczone', + components: ['basic.rep'], + }, + }, + }, + { + 'basic.rep': { + attributes: { + time: { + type: 'time', + }, + }, + }, + } + ); + + const expected = { dynamicZoneTest: [{ __component: 'basic.rep', time: '00:02:00' }] }; + + expect(result).toEqual(expected); + }); +}); diff --git a/packages/core/admin/admin/src/content-manager/pages/ListView/index.js b/packages/core/admin/admin/src/content-manager/pages/ListView/index.js index 8fc10adce9..9c7a70769e 100644 --- a/packages/core/admin/admin/src/content-manager/pages/ListView/index.js +++ b/packages/core/admin/admin/src/content-manager/pages/ListView/index.js @@ -309,8 +309,8 @@ function ListView({ { target: headerLayoutTitle } )} placeholder={formatMessage({ - id: 'app.component.search.placeholder', - defaultMessage: 'Search...', + id: 'global.search', + defaultMessage: 'Search', })} trackedEvent="didSearch" /> diff --git a/packages/core/admin/admin/src/translations/en.json b/packages/core/admin/admin/src/translations/en.json index a5f7210f95..696af5c8fb 100644 --- a/packages/core/admin/admin/src/translations/en.json +++ b/packages/core/admin/admin/src/translations/en.json @@ -679,6 +679,7 @@ "content-manager.apiError.This attribute must be unique": "{field} must be unique", "form.button.continue": "Continue", "form.button.done": "Done", + "global.search": "Search", "global.actions": "Actions", "global.back": "Back", "global.change-password": "Change password", diff --git a/packages/core/admin/admin/src/translations/zh-Hans.json b/packages/core/admin/admin/src/translations/zh-Hans.json index 8143631071..88a6e7d27a 100644 --- a/packages/core/admin/admin/src/translations/zh-Hans.json +++ b/packages/core/admin/admin/src/translations/zh-Hans.json @@ -604,7 +604,7 @@ "content-type-builder.menu.section.single-types.name": "单一类型", "content-type-builder.plugin.name": "模型构建器", "form.button.done": "完成", - "global.Search": "搜索", + "global.search": "搜索", "global.back": "返回", "global.content-manager": "内容管理", "global.delete-target": "删除 {target}", diff --git a/packages/core/admin/package.json b/packages/core/admin/package.json index 4c6819853c..df412725bc 100644 --- a/packages/core/admin/package.json +++ b/packages/core/admin/package.json @@ -56,7 +56,7 @@ "@strapi/icons": "1.2.0", "@strapi/utils": "4.2.2", "axios": "0.24.0", - "babel-loader": "8.2.3", + "babel-loader": "8.2.5", "babel-plugin-styled-components": "2.0.2", "bcryptjs": "2.4.3", "chalk": "^4.1.1", @@ -104,7 +104,7 @@ "prop-types": "^15.7.2", "qs": "6.10.1", "react": "^17.0.2", - "react-copy-to-clipboard": "^5.0.3", + "react-copy-to-clipboard": "^5.1.0", "react-dnd": "^14.0.2", "react-dnd-html5-backend": "^14.0.0", "react-dom": "^17.0.2", @@ -129,7 +129,7 @@ "style-loader": "3.3.1", "styled-components": "5.3.3", "webpack": "5.65.0", - "webpack-cli": "4.9.1", + "webpack-cli": "4.10.0", "webpack-dev-server": "4.7.3", "webpackbar": "5.0.0-3", "yup": "^0.32.9" diff --git a/packages/core/content-type-builder/admin/src/components/ContentTypeBuilderNav/index.js b/packages/core/content-type-builder/admin/src/components/ContentTypeBuilderNav/index.js index 1f90201d36..945781fe98 100644 --- a/packages/core/content-type-builder/admin/src/components/ContentTypeBuilderNav/index.js +++ b/packages/core/content-type-builder/admin/src/components/ContentTypeBuilderNav/index.js @@ -36,7 +36,10 @@ const ContentTypeBuilderNav = () => { id: `${getTrad('plugin.name')}`, defaultMessage: 'Content-Types Builder', })} - searchLabel="Search..." + searchLabel={formatMessage({ + id: 'global.search', + defaultMessage: 'Search', + })} /> {menu.map(section => { diff --git a/packages/core/helper-plugin/lib/src/components/GenericInput/index.js b/packages/core/helper-plugin/lib/src/components/GenericInput/index.js index 3c71ed74e0..3f8345987c 100644 --- a/packages/core/helper-plugin/lib/src/components/GenericInput/index.js +++ b/packages/core/helper-plugin/lib/src/components/GenericInput/index.js @@ -250,9 +250,7 @@ const GenericInput = ({ id={name} hint={hint} name={name} - onValueChange={value => { - onChange({ target: { name, value: value ?? null, type } }); - }} + onValueChange={value => onChange({ target: { name, value, type } })} placeholder={formattedPlaceholder} required={required} step={step} @@ -352,9 +350,7 @@ const GenericInput = ({ id={name} hint={hint} name={name} - onChange={value => { - onChange({ target: { name, value: value === '' ? null : value, type: 'select' } }); - }} + onChange={value => onChange({ target: { name, value, type: 'select' } })} placeholder={formattedPlaceholder} required={required} value={value} diff --git a/packages/core/helper-plugin/lib/src/components/GenericInput/tests/index.test.js b/packages/core/helper-plugin/lib/src/components/GenericInput/tests/index.test.js index e90125c2ea..8498024144 100644 --- a/packages/core/helper-plugin/lib/src/components/GenericInput/tests/index.test.js +++ b/packages/core/helper-plugin/lib/src/components/GenericInput/tests/index.test.js @@ -110,14 +110,5 @@ describe('GenericInput', () => { target: { name: 'number', type: 'number', value: 0 }, }); }); - - test('does call onChange callback with null on empty value', () => { - const spy = jest.fn(); - const { input } = setupNumber({ value: 1, onChange: spy }); - - fireEvent.change(input, { target: { value: '' } }); - - expect(spy).toHaveBeenCalledWith({ target: { name: 'number', type: 'number', value: null } }); - }); }); }); diff --git a/packages/core/helper-plugin/lib/src/components/SearchURLQuery/index.js b/packages/core/helper-plugin/lib/src/components/SearchURLQuery/index.js index 0dcb4c94ac..cdecfc4983 100644 --- a/packages/core/helper-plugin/lib/src/components/SearchURLQuery/index.js +++ b/packages/core/helper-plugin/lib/src/components/SearchURLQuery/index.js @@ -71,7 +71,7 @@ const SearchURLQuery = ({ label, placeholder, trackedEvent }) => { } - label="Search" + label={formatMessage({ id: 'global.search', defaultMessage: 'Search' })} onClick={handleToggle} /> ); diff --git a/packages/core/helper-plugin/package.json b/packages/core/helper-plugin/package.json index 389c261a7d..a6fc20db05 100644 --- a/packages/core/helper-plugin/package.json +++ b/packages/core/helper-plugin/package.json @@ -70,13 +70,13 @@ "@babel/runtime": "7.16.7", "@storybook/addon-actions": "6.4.10", "@storybook/addon-essentials": "6.4.10", - "@storybook/addon-links": "6.4.10", - "@storybook/builder-webpack5": "6.4.10", + "@storybook/addon-links": "6.5.9", + "@storybook/builder-webpack5": "6.5.9", "@storybook/manager-webpack5": "6.4.10", "@storybook/react": "^6.3.7", "@strapi/design-system": "1.2.0", "@strapi/icons": "1.2.0", - "babel-loader": "^8.2.2", + "babel-loader": "^8.2.5", "cross-env": "^7.0.3", "date-fns": "2.22.1", "rimraf": "3.0.2" diff --git a/packages/core/strapi/package.json b/packages/core/strapi/package.json index 2d59c80650..4bc7e7e2e3 100644 --- a/packages/core/strapi/package.json +++ b/packages/core/strapi/package.json @@ -105,7 +105,7 @@ "fs-extra": "10.0.0", "glob": "7.2.0", "http-errors": "1.8.1", - "inquirer": "8.2.0", + "inquirer": "8.2.4", "is-docker": "2.2.1", "koa": "2.13.3", "koa-body": "4.2.0", diff --git a/packages/core/upload/package.json b/packages/core/upload/package.json index c1d6175e3c..816e703258 100644 --- a/packages/core/upload/package.json +++ b/packages/core/upload/package.json @@ -27,7 +27,7 @@ "@strapi/provider-upload-local": "4.2.2", "@strapi/utils": "4.2.2", "byte-size": "7.0.1", - "cropperjs": "1.5.11", + "cropperjs": "1.5.12", "fs-extra": "10.0.0", "immer": "9.0.6", "koa-range": "0.3.0", @@ -35,7 +35,7 @@ "lodash": "4.17.21", "mime-types": "2.1.35", "react": "^17.0.2", - "react-copy-to-clipboard": "^5.0.3", + "react-copy-to-clipboard": "^5.1.0", "react-dom": "^17.0.2", "react-intl": "5.20.2", "react-redux": "7.2.3", diff --git a/packages/generators/app/package.json b/packages/generators/app/package.json index a4721daec7..a8b8a3e5bd 100644 --- a/packages/generators/app/package.json +++ b/packages/generators/app/package.json @@ -40,7 +40,7 @@ "chalk": "^4.1.1", "execa": "^1.0.0", "fs-extra": "10.0.0", - "inquirer": "8.2.0", + "inquirer": "8.2.4", "lodash": "4.17.21", "node-fetch": "^2.6.1", "node-machine-id": "^1.1.10", diff --git a/packages/plugins/documentation/package.json b/packages/plugins/documentation/package.json index 5f3cf309e5..0a8ffddafd 100644 --- a/packages/plugins/documentation/package.json +++ b/packages/plugins/documentation/package.json @@ -34,7 +34,7 @@ "path-to-regexp": "6.2.0", "pluralize": "8.0.0", "react": "^17.0.2", - "react-copy-to-clipboard": "^5.0.3", + "react-copy-to-clipboard": "^5.1.0", "react-dom": "^17.0.2", "react-intl": "5.20.2", "react-redux": "7.2.3", diff --git a/yarn.lock b/yarn.lock index 62319003b5..dffac11b11 100644 --- a/yarn.lock +++ b/yarn.lock @@ -170,28 +170,7 @@ semver "^6.3.0" source-map "^0.5.0" -"@babel/core@>=7.9.0", "@babel/core@^7.1.0", "@babel/core@^7.12.3", "@babel/core@^7.7.5": - version "7.17.9" - resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.17.9.tgz#6bae81a06d95f4d0dec5bb9d74bbc1f58babdcfe" - integrity sha512-5ug+SfZCpDAkVp9SFIZAzlW18rlzsOcJGaetCjkySnrXXDUw9AR8cDUm1iByTmdWM6yxX6/zycaV76w3YTF2gw== - dependencies: - "@ampproject/remapping" "^2.1.0" - "@babel/code-frame" "^7.16.7" - "@babel/generator" "^7.17.9" - "@babel/helper-compilation-targets" "^7.17.7" - "@babel/helper-module-transforms" "^7.17.7" - "@babel/helpers" "^7.17.9" - "@babel/parser" "^7.17.9" - "@babel/template" "^7.16.7" - "@babel/traverse" "^7.17.9" - "@babel/types" "^7.17.0" - convert-source-map "^1.7.0" - debug "^4.1.0" - gensync "^1.0.0-beta.2" - json5 "^2.2.1" - semver "^6.3.0" - -"@babel/core@^7.12.10": +"@babel/core@>=7.9.0", "@babel/core@^7.1.0", "@babel/core@^7.12.10", "@babel/core@^7.12.3", "@babel/core@^7.7.5": version "7.18.5" resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.18.5.tgz#c597fa680e58d571c28dda9827669c78cdd7f000" integrity sha512-MGY8vg3DxMnctw0LdvSEojOsumc70g0t18gNyUdAZqB1Rpd1Bqo/svHGvt+UJ6JcGX+DIekGFDxxIWofBxLCnQ== @@ -254,7 +233,7 @@ "@babel/helper-explode-assignable-expression" "^7.16.7" "@babel/types" "^7.16.7" -"@babel/helper-compilation-targets@^7.13.0", "@babel/helper-compilation-targets@^7.16.7", "@babel/helper-compilation-targets@^7.17.7": +"@babel/helper-compilation-targets@^7.13.0", "@babel/helper-compilation-targets@^7.16.7": version "7.17.7" resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.17.7.tgz#a3c2924f5e5f0379b356d4cfb313d1414dc30e46" integrity sha512-UFzlz2jjd8kroj0hmCFV5zr+tQPi1dpC2cRsDV/3IEW8bJfCPrPpmcSN6ZS8RqIq4LXcmpipCQFPddyFA5Yc7w== @@ -530,7 +509,7 @@ "@babel/traverse" "^7.18.2" "@babel/types" "^7.18.2" -"@babel/helpers@^7.16.7", "@babel/helpers@^7.17.9": +"@babel/helpers@^7.16.7": version "7.17.9" resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.17.9.tgz#b2af120821bfbe44f9907b1826e168e819375a1a" integrity sha512-cPCt915ShDWUEzEp3+UNRktO2n6v49l5RSnG9M5pS24hA+2FAc5si+Pn1i4VVbQQ+jh+bIZhPFQOJOzbrOYY1Q== @@ -4084,16 +4063,16 @@ regenerator-runtime "^0.13.7" ts-dedent "^2.0.0" -"@storybook/addon-links@6.4.10": - version "6.4.10" - resolved "https://registry.yarnpkg.com/@storybook/addon-links/-/addon-links-6.4.10.tgz#a35ff6551965d341a12f7796ca11a46902135a1a" - integrity sha512-5x7Rem5CchFCoKuxDhD7BaM8axVlDG/0rjkpZZZdCtmHtobWXA8Fn/72WX4keEJgl9Z+WV4BTYZpeSxV3lC2RA== +"@storybook/addon-links@6.5.9": + version "6.5.9" + resolved "https://registry.yarnpkg.com/@storybook/addon-links/-/addon-links-6.5.9.tgz#91cbca0c044796badf2498723fdd10dacea5748b" + integrity sha512-4BYC7pkxL3NLRnEgTA9jpIkObQKril+XFj1WtmY/lngF90vvK0Kc/TtvTA2/5tSgrHfxEuPevIdxMIyLJ4ejWQ== dependencies: - "@storybook/addons" "6.4.10" - "@storybook/client-logger" "6.4.10" - "@storybook/core-events" "6.4.10" - "@storybook/csf" "0.0.2--canary.87bc651.0" - "@storybook/router" "6.4.10" + "@storybook/addons" "6.5.9" + "@storybook/client-logger" "6.5.9" + "@storybook/core-events" "6.5.9" + "@storybook/csf" "0.0.2--canary.4566f4d.1" + "@storybook/router" "6.5.9" "@types/qs" "^6.9.5" core-js "^3.8.2" global "^4.4.0" @@ -4370,50 +4349,31 @@ webpack-hot-middleware "^2.25.1" webpack-virtual-modules "^0.2.2" -"@storybook/builder-webpack5@6.4.10": - version "6.4.10" - resolved "https://registry.yarnpkg.com/@storybook/builder-webpack5/-/builder-webpack5-6.4.10.tgz#3ffe16892e228e2abef84285bb2b027b558e7087" - integrity sha512-REh1gtSCDlGtpQRcA1gAn0HBcxp6WVdFWzMbJi8R8NtUuwKAnzTAlunb/mrnq6szLq7LMT5T/pcUEvhJMOh2ng== +"@storybook/builder-webpack5@6.5.9": + version "6.5.9" + resolved "https://registry.yarnpkg.com/@storybook/builder-webpack5/-/builder-webpack5-6.5.9.tgz#30b4e08622daff104bcccd015d3ee7902f99dd99" + integrity sha512-NUVZ4Qci6HWPuoH8U/zQkdBO5soGgu7QYrGC/LWU0tRfmmZxkjr7IUU14ppDpGPYgx3r7jkaQI1J/E1YEmSCWQ== dependencies: "@babel/core" "^7.12.10" - "@babel/plugin-proposal-class-properties" "^7.12.1" - "@babel/plugin-proposal-decorators" "^7.12.12" - "@babel/plugin-proposal-export-default-from" "^7.12.1" - "@babel/plugin-proposal-nullish-coalescing-operator" "^7.12.1" - "@babel/plugin-proposal-object-rest-spread" "^7.12.1" - "@babel/plugin-proposal-optional-chaining" "^7.12.7" - "@babel/plugin-proposal-private-methods" "^7.12.1" - "@babel/plugin-syntax-dynamic-import" "^7.8.3" - "@babel/plugin-transform-arrow-functions" "^7.12.1" - "@babel/plugin-transform-block-scoping" "^7.12.12" - "@babel/plugin-transform-classes" "^7.12.1" - "@babel/plugin-transform-destructuring" "^7.12.1" - "@babel/plugin-transform-for-of" "^7.12.1" - "@babel/plugin-transform-parameters" "^7.12.1" - "@babel/plugin-transform-shorthand-properties" "^7.12.1" - "@babel/plugin-transform-spread" "^7.12.1" - "@babel/preset-env" "^7.12.11" - "@babel/preset-react" "^7.12.10" - "@babel/preset-typescript" "^7.12.7" - "@storybook/addons" "6.4.10" - "@storybook/api" "6.4.10" - "@storybook/channel-postmessage" "6.4.10" - "@storybook/channels" "6.4.10" - "@storybook/client-api" "6.4.10" - "@storybook/client-logger" "6.4.10" - "@storybook/components" "6.4.10" - "@storybook/core-common" "6.4.10" - "@storybook/core-events" "6.4.10" - "@storybook/node-logger" "6.4.10" - "@storybook/preview-web" "6.4.10" - "@storybook/router" "6.4.10" + "@storybook/addons" "6.5.9" + "@storybook/api" "6.5.9" + "@storybook/channel-postmessage" "6.5.9" + "@storybook/channels" "6.5.9" + "@storybook/client-api" "6.5.9" + "@storybook/client-logger" "6.5.9" + "@storybook/components" "6.5.9" + "@storybook/core-common" "6.5.9" + "@storybook/core-events" "6.5.9" + "@storybook/node-logger" "6.5.9" + "@storybook/preview-web" "6.5.9" + "@storybook/router" "6.5.9" "@storybook/semver" "^7.3.2" - "@storybook/store" "6.4.10" - "@storybook/theming" "6.4.10" - "@types/node" "^14.0.10" + "@storybook/store" "6.5.9" + "@storybook/theming" "6.5.9" + "@types/node" "^14.0.10 || ^16.0.0" babel-loader "^8.0.0" - babel-plugin-macros "^3.0.1" - babel-plugin-polyfill-corejs3 "^0.1.0" + babel-plugin-named-exports-order "^0.0.2" + browser-assert "^1.2.1" case-sensitive-paths-webpack-plugin "^2.3.0" core-js "^3.8.2" css-loader "^5.0.1" @@ -4422,7 +4382,7 @@ glob-promise "^3.4.0" html-webpack-plugin "^5.0.0" path-browserify "^1.0.1" - react-dev-utils "^11.0.4" + process "^0.11.10" stable "^0.1.8" style-loader "^2.0.0" terser-webpack-plugin "^5.0.3" @@ -6655,22 +6615,22 @@ "@webassemblyjs/wast-parser" "1.9.0" "@xtuc/long" "4.2.2" -"@webpack-cli/configtest@^1.1.0": - version "1.1.1" - resolved "https://registry.yarnpkg.com/@webpack-cli/configtest/-/configtest-1.1.1.tgz#9f53b1b7946a6efc2a749095a4f450e2932e8356" - integrity sha512-1FBc1f9G4P/AxMqIgfZgeOTuRnwZMten8E7zap5zgpPInnCrP8D4Q81+4CWIch8i/Nf7nXjP0v6CjjbHOrXhKg== +"@webpack-cli/configtest@^1.2.0": + version "1.2.0" + resolved "https://registry.yarnpkg.com/@webpack-cli/configtest/-/configtest-1.2.0.tgz#7b20ce1c12533912c3b217ea68262365fa29a6f5" + integrity sha512-4FB8Tj6xyVkyqjj1OaTqCjXYULB9FMkqQ8yGrZjRDrYh0nOE+7Lhs45WioWQQMV+ceFlE368Ukhe6xdvJM9Egg== -"@webpack-cli/info@^1.4.0": - version "1.4.1" - resolved "https://registry.yarnpkg.com/@webpack-cli/info/-/info-1.4.1.tgz#2360ea1710cbbb97ff156a3f0f24556e0fc1ebea" - integrity sha512-PKVGmazEq3oAo46Q63tpMr4HipI3OPfP7LiNOEJg963RMgT0rqheag28NCML0o3GIzA3DmxP1ZIAv9oTX1CUIA== +"@webpack-cli/info@^1.5.0": + version "1.5.0" + resolved "https://registry.yarnpkg.com/@webpack-cli/info/-/info-1.5.0.tgz#6c78c13c5874852d6e2dd17f08a41f3fe4c261b1" + integrity sha512-e8tSXZpw2hPl2uMJY6fsMswaok5FdlGNRTktvFk2sD8RjH0hE2+XistawJx1vmKteh4NmGmNUrp+Tb2w+udPcQ== dependencies: envinfo "^7.7.3" -"@webpack-cli/serve@^1.6.0": - version "1.6.1" - resolved "https://registry.yarnpkg.com/@webpack-cli/serve/-/serve-1.6.1.tgz#0de2875ac31b46b6c5bb1ae0a7d7f0ba5678dffe" - integrity sha512-gNGTiTrjEVQ0OcVnzsRSqTxaBSr+dmTfm+qJsCDluky8uhdLWep7Gcr62QsAKHTMxjCS/8nEITsmFAhfIx+QSw== +"@webpack-cli/serve@^1.7.0": + version "1.7.0" + resolved "https://registry.yarnpkg.com/@webpack-cli/serve/-/serve-1.7.0.tgz#e1993689ac42d2b16e9194376cfb6753f6254db1" + integrity sha512-oxnCNGj88fL+xzV+dacXs44HcDwf1ovs3AuEzvP7mqXw7fQntqIhQ1BRmynh4qEKQSSSRSWVyXRjmTbZIX9V2Q== "@xmldom/xmldom@^0.7.5": version "0.7.5" @@ -7587,17 +7547,7 @@ babel-jest@^26.6.3: graceful-fs "^4.2.4" slash "^3.0.0" -babel-loader@8.2.3: - version "8.2.3" - resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.2.3.tgz#8986b40f1a64cacfcb4b8429320085ef68b1342d" - integrity sha512-n4Zeta8NC3QAsuyiizu0GkmRcQ6clkV9WFUnUf1iXP//IeSKbWjofW3UHyZVwlOB4y039YQKefawyTn64Zwbuw== - dependencies: - find-cache-dir "^3.3.1" - loader-utils "^1.4.0" - make-dir "^3.1.0" - schema-utils "^2.6.5" - -babel-loader@^8.0.0, babel-loader@^8.2.2: +babel-loader@8.2.5, babel-loader@^8.0.0, babel-loader@^8.2.5: version "8.2.5" resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.2.5.tgz#d45f585e654d5a5d90f5350a779d7647c5ed512e" integrity sha512-OSiFfH89LrEMiWd4pLNqGz4CwJDtbs2ZVc+iGu2HrkRfPxId9F2anQj38IxWpmRfsUY0aBZYi1EFcd3mhtRMLQ== @@ -7689,6 +7639,11 @@ babel-plugin-macros@^3.0.1: cosmiconfig "^7.0.0" resolve "^1.19.0" +babel-plugin-named-exports-order@^0.0.2: + version "0.0.2" + resolved "https://registry.yarnpkg.com/babel-plugin-named-exports-order/-/babel-plugin-named-exports-order-0.0.2.tgz#ae14909521cf9606094a2048239d69847540cb09" + integrity sha512-OgOYHOLoRK+/mvXU9imKHlG6GkPLYrUCvFXG/CM93R/aNNO8pOOF4aS+S8CCHMDQoNSeiOYEZb/G6RwL95Jktw== + babel-plugin-polyfill-corejs2@^0.3.0: version "0.3.1" resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.3.1.tgz#440f1b70ccfaabc6b676d196239b138f8a2cfba5" @@ -8080,6 +8035,11 @@ brorand@^1.0.1, brorand@^1.1.0: resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f" integrity sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8= +browser-assert@^1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/browser-assert/-/browser-assert-1.2.1.tgz#9aaa5a2a8c74685c2ae05bfe46efd606f068c200" + integrity sha512-nfulgvOR6S4gt9UKCeGJOuSGBPGiFT6oQ/2UBnvTY/5aQ1PnksW72fhZkM30DzoRRv2WpwZf1vHHEr3mtuXIWQ== + browser-process-hrtime@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz#3c9b4b7d782c8121e56f10106d84c0d0ffc94626" @@ -9437,7 +9397,7 @@ copy-descriptor@^0.1.0: resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d" integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40= -copy-to-clipboard@^3, copy-to-clipboard@^3.3.1: +copy-to-clipboard@^3.3.1: version "3.3.1" resolved "https://registry.yarnpkg.com/copy-to-clipboard/-/copy-to-clipboard-3.3.1.tgz#115aa1a9998ffab6196f93076ad6da3b913662ae" integrity sha512-i13qo6kIHTTpCm8/Wup+0b1mVWETvu2kIMzKoK8FpkLkFxlt0znUAHcMzox+T8sPlqtZXq3CulEjQHsYiGFJUw== @@ -9603,10 +9563,10 @@ cron-parser@^3.1.0: is-nan "^1.3.2" luxon "^1.26.0" -cropperjs@1.5.11: - version "1.5.11" - resolved "https://registry.yarnpkg.com/cropperjs/-/cropperjs-1.5.11.tgz#502ae6d8ca098b124de6813601cca70015879fc0" - integrity sha512-SJUeBBhtNBnnn+UrLKluhFRIXLJn7XFPv8QN1j49X5t+BIMwkgvDev541f96bmu8Xe0TgCx3gON22KmY/VddaA== +cropperjs@1.5.12: + version "1.5.12" + resolved "https://registry.yarnpkg.com/cropperjs/-/cropperjs-1.5.12.tgz#d9c0db2bfb8c0d769d51739e8f916bbc44e10f50" + integrity sha512-re7UdjE5UnwdrovyhNzZ6gathI4Rs3KGCBSc8HCIjUo5hO42CtzyblmWLj6QWVw7huHyDMfpKxhiO2II77nhDw== cross-env@7.0.3, cross-env@^7.0.3: version "7.0.3" @@ -13646,10 +13606,10 @@ inline-style-parser@0.1.1: resolved "https://registry.yarnpkg.com/inline-style-parser/-/inline-style-parser-0.1.1.tgz#ec8a3b429274e9c0a1f1c4ffa9453a7fef72cea1" integrity sha512-7NXolsK4CAS5+xvdj5OMMbI962hU/wvwoxk+LWR9Ek9bVtyuuYScDN6eS0rUm6TxApFpw7CX1o4uJzcd4AyD3Q== -inquirer@8.2.0: - version "8.2.0" - resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-8.2.0.tgz#f44f008dd344bbfc4b30031f45d984e034a3ac3a" - integrity sha512-0crLweprevJ02tTuA6ThpoAERAGyVILC4sS74uib58Xf/zSr1/ZWtmm7D5CI+bSQEaA04f0K7idaHpQbSWgiVQ== +inquirer@8.2.4, inquirer@^8.2.0: + version "8.2.4" + resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-8.2.4.tgz#ddbfe86ca2f67649a67daa6f1051c128f684f0b4" + integrity sha512-nn4F01dxU8VeKfq192IjLsxu0/OmMZ4Lg3xKAns148rCaXP6ntAoEkVYZThWjwON8AlzdZZi6oqnhNbxUG9hVg== dependencies: ansi-escapes "^4.2.1" chalk "^4.1.1" @@ -13661,10 +13621,11 @@ inquirer@8.2.0: mute-stream "0.0.8" ora "^5.4.1" run-async "^2.4.0" - rxjs "^7.2.0" + rxjs "^7.5.5" string-width "^4.1.0" strip-ansi "^6.0.0" through "^2.3.6" + wrap-ansi "^7.0.0" inquirer@^7.1.0, inquirer@^7.3.3: version "7.3.3" @@ -13685,26 +13646,6 @@ inquirer@^7.1.0, inquirer@^7.3.3: strip-ansi "^6.0.0" through "^2.3.6" -inquirer@^8.2.0: - version "8.2.2" - resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-8.2.2.tgz#1310517a87a0814d25336c78a20b44c3d9b7629d" - integrity sha512-pG7I/si6K/0X7p1qU+rfWnpTE1UIkTONN1wxtzh0d+dHXtT/JG6qBgLxoyHVsQa8cFABxAPh0pD6uUUHiAoaow== - dependencies: - ansi-escapes "^4.2.1" - chalk "^4.1.1" - cli-cursor "^3.1.0" - cli-width "^3.0.0" - external-editor "^3.0.3" - figures "^3.0.0" - lodash "^4.17.21" - mute-stream "0.0.8" - ora "^5.4.1" - run-async "^2.4.0" - rxjs "^7.5.5" - string-width "^4.1.0" - strip-ansi "^6.0.0" - through "^2.3.6" - internal-slot@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.3.tgz#7347e307deeea2faac2ac6205d4bc7d34967f59c" @@ -15766,7 +15707,7 @@ loader-utils@2.0.0: emojis-list "^3.0.0" json5 "^2.1.2" -loader-utils@^1.2.3, loader-utils@^1.4.0: +loader-utils@^1.2.3: version "1.4.0" resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.4.0.tgz#c579b5e34cb34b1a74edc6c1fb36bfa371d5a613" integrity sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA== @@ -19423,13 +19364,13 @@ react-colorful@^5.1.2: resolved "https://registry.yarnpkg.com/react-colorful/-/react-colorful-5.5.1.tgz#29d9c4e496f2ca784dd2bb5053a3a4340cfaf784" integrity sha512-M1TJH2X3RXEt12sWkpa6hLc/bbYS0H6F4rIqjQZ+RxNBstpY67d9TrFXtqdZwhpmBXcCwEi7stKqFue3ZRkiOg== -react-copy-to-clipboard@^5.0.3: - version "5.0.4" - resolved "https://registry.yarnpkg.com/react-copy-to-clipboard/-/react-copy-to-clipboard-5.0.4.tgz#42ec519b03eb9413b118af92d1780c403a5f19bf" - integrity sha512-IeVAiNVKjSPeGax/Gmkqfa/+PuMTBhutEvFUaMQLwE2tS0EXrAdgOpWDX26bWTXF3HrioorR7lr08NqeYUWQCQ== +react-copy-to-clipboard@^5.1.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/react-copy-to-clipboard/-/react-copy-to-clipboard-5.1.0.tgz#09aae5ec4c62750ccb2e6421a58725eabc41255c" + integrity sha512-k61RsNgAayIJNoy9yDsYzDe/yAZAzEbEgcz3DZMhF686LEyukcE1hzurxe85JandPUG+yTfGVFzuEw3xt8WP/A== dependencies: - copy-to-clipboard "^3" - prop-types "^15.5.8" + copy-to-clipboard "^3.3.1" + prop-types "^15.8.1" react-dev-utils@^11.0.4: version "11.0.4" @@ -20658,7 +20599,7 @@ rxjs@^6.4.0, rxjs@^6.6.0: dependencies: tslib "^1.9.0" -rxjs@^7.2.0, rxjs@^7.5.1, rxjs@^7.5.5: +rxjs@^7.5.1, rxjs@^7.5.5: version "7.5.5" resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-7.5.5.tgz#2ebad89af0f560f460ad5cc4213219e1f7dd4e9f" integrity sha512-sy+H0pQofO95VDmFLzyaw9xNJU4KTRSwQIGM6+iG3SypAtCiLDzpeG8sJrNCWn2Up9km+KhkvTdbkrdy+yzZdw== @@ -22350,7 +22291,7 @@ terser-webpack-plugin@^4.2.3: terser "^5.3.4" webpack-sources "^1.4.3" -terser-webpack-plugin@^5.0.3: +terser-webpack-plugin@^5.0.3, terser-webpack-plugin@^5.1.3: version "5.3.3" resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-5.3.3.tgz#8033db876dd5875487213e87c627bca323e5ed90" integrity sha512-Fx60G5HNYknNTNQnzQ1VePRuu89ZVYWfjRAeT5rITuCY/1b08s49e5kSQwHDirKZWuoKOBRFS98EUUoZ9kLEwQ== @@ -22361,17 +22302,6 @@ terser-webpack-plugin@^5.0.3: serialize-javascript "^6.0.0" terser "^5.7.2" -terser-webpack-plugin@^5.1.3: - version "5.3.1" - resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-5.3.1.tgz#0320dcc270ad5372c1e8993fabbd927929773e54" - integrity sha512-GvlZdT6wPQKbDNW/GDQzZFg/j4vKU96yl2q6mcUkzKOgW4gwf1Z8cZToUCrz31XHlPWH8MVb1r2tFtdDtTGJ7g== - dependencies: - jest-worker "^27.4.5" - schema-utils "^3.1.1" - serialize-javascript "^6.0.0" - source-map "^0.6.1" - terser "^5.7.2" - terser@^4.1.2, terser@^4.6.3: version "4.8.0" resolved "https://registry.yarnpkg.com/terser/-/terser-4.8.0.tgz#63056343d7c70bb29f3af665865a46fe03a0df17" @@ -23490,18 +23420,18 @@ webpack-bundle-analyzer@4.4.1: sirv "^1.0.7" ws "^7.3.1" -webpack-cli@4.9.1: - version "4.9.1" - resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-4.9.1.tgz#b64be825e2d1b130f285c314caa3b1ba9a4632b3" - integrity sha512-JYRFVuyFpzDxMDB+v/nanUdQYcZtqFPGzmlW4s+UkPMFhSpfRNmf1z4AwYcHJVdvEFAM7FFCQdNTpsBYhDLusQ== +webpack-cli@4.10.0: + version "4.10.0" + resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-4.10.0.tgz#37c1d69c8d85214c5a65e589378f53aec64dab31" + integrity sha512-NLhDfH/h4O6UOy+0LSso42xvYypClINuMNBVVzX4vX98TmTaTUxwRbXdhucbFMd2qLaCTcLq/PdYrvi8onw90w== dependencies: "@discoveryjs/json-ext" "^0.5.0" - "@webpack-cli/configtest" "^1.1.0" - "@webpack-cli/info" "^1.4.0" - "@webpack-cli/serve" "^1.6.0" + "@webpack-cli/configtest" "^1.2.0" + "@webpack-cli/info" "^1.5.0" + "@webpack-cli/serve" "^1.7.0" colorette "^2.0.14" commander "^7.0.0" - execa "^5.0.0" + cross-spawn "^7.0.3" fastest-levenshtein "^1.0.12" import-local "^3.0.2" interpret "^2.2.0"