From f14ebbe234baba74c25acae9c3cd58355b095736 Mon Sep 17 00:00:00 2001
From: Sebastien LE MOUILLOUR <32456736+smouillour@users.noreply.github.com>
Date: Thu, 16 Nov 2023 10:17:19 +0100
Subject: [PATCH] fix(TDOPS-5683): Add missing deps for latest packages, fix
eslint and fix react-webpack using BASENAME without CDN (#4990)
---
.changeset/clever-humans-promise.md | 5 +++
.changeset/fast-seas-suffer.md | 5 +++
.changeset/gold-carrots-brush.md | 5 +++
.changeset/lazy-tools-invite.md | 5 +++
.changeset/nasty-tips-bow.md | 5 +++
.changeset/silly-grapes-sleep.md | 5 +++
.changeset/tricky-ties-scream.md | 5 +++
.changeset/weak-tips-own.md | 5 +++
fork/bootstrap-sass/package.json | 5 +++
.../dynamic-cdn-webpack-plugin/.eslintrc.json | 14 +++++++-
fork/dynamic-cdn-webpack-plugin/.gitignore | 1 +
fork/dynamic-cdn-webpack-plugin/package.json | 3 ++
fork/dynamic-cdn-webpack-plugin/src/find.js | 36 +++++++++----------
.../src/find.test.js | 9 ++---
.../test/core.test.js | 4 +--
.../node_modules/regenerator-runtime/index.js | 1 +
.../regenerator-runtime/package.json | 6 ++++
fork/react-bootstrap/server/ModalSpec.js | 11 +++---
packages/components/package.json | 1 -
.../Actions/ActionButton/Button.stories.js | 24 +------------
packages/design-system/package.json | 1 +
packages/playground/.talend/head.html | 8 +++++
packages/playground/src/app/index.js | 16 +++++----
packages/playground/talend-scripts.json | 3 +-
tools/scripts-cmf/package.json | 1 +
tools/scripts-config-eslint/.eslintrc.json | 4 +--
tools/scripts-config-eslint/index.js | 3 +-
tools/scripts-config-prettier/package.json | 1 +
.../config/webpack.config.js | 5 +++
yarn.lock | 28 +--------------
30 files changed, 129 insertions(+), 96 deletions(-)
create mode 100644 .changeset/clever-humans-promise.md
create mode 100644 .changeset/fast-seas-suffer.md
create mode 100644 .changeset/gold-carrots-brush.md
create mode 100644 .changeset/lazy-tools-invite.md
create mode 100644 .changeset/nasty-tips-bow.md
create mode 100644 .changeset/silly-grapes-sleep.md
create mode 100644 .changeset/tricky-ties-scream.md
create mode 100644 .changeset/weak-tips-own.md
create mode 100644 fork/dynamic-cdn-webpack-plugin/test/fixtures/app/node_modules/regenerator-runtime/index.js
create mode 100644 fork/dynamic-cdn-webpack-plugin/test/fixtures/app/node_modules/regenerator-runtime/package.json
create mode 100644 packages/playground/.talend/head.html
diff --git a/.changeset/clever-humans-promise.md b/.changeset/clever-humans-promise.md
new file mode 100644
index 00000000000..9e086dba84c
--- /dev/null
+++ b/.changeset/clever-humans-promise.md
@@ -0,0 +1,5 @@
+---
+'@talend/scripts-config-react-webpack': patch
+---
+
+Fix possibility to use BASENAME even if we are not using the cdn
diff --git a/.changeset/fast-seas-suffer.md b/.changeset/fast-seas-suffer.md
new file mode 100644
index 00000000000..01bc7ee68a2
--- /dev/null
+++ b/.changeset/fast-seas-suffer.md
@@ -0,0 +1,5 @@
+---
+'@talend/react-bootstrap': patch
+---
+
+Fix lint issue
diff --git a/.changeset/gold-carrots-brush.md b/.changeset/gold-carrots-brush.md
new file mode 100644
index 00000000000..d5d82945543
--- /dev/null
+++ b/.changeset/gold-carrots-brush.md
@@ -0,0 +1,5 @@
+---
+'@talend/bootstrap-sass': patch
+---
+
+Add missing deps
diff --git a/.changeset/lazy-tools-invite.md b/.changeset/lazy-tools-invite.md
new file mode 100644
index 00000000000..de7f47ee17a
--- /dev/null
+++ b/.changeset/lazy-tools-invite.md
@@ -0,0 +1,5 @@
+---
+'@talend/design-system': patch
+---
+
+Add missing deps
diff --git a/.changeset/nasty-tips-bow.md b/.changeset/nasty-tips-bow.md
new file mode 100644
index 00000000000..21da9eb22be
--- /dev/null
+++ b/.changeset/nasty-tips-bow.md
@@ -0,0 +1,5 @@
+---
+'@talend/scripts-config-prettier': patch
+---
+
+Add missing deps
diff --git a/.changeset/silly-grapes-sleep.md b/.changeset/silly-grapes-sleep.md
new file mode 100644
index 00000000000..609f99ec232
--- /dev/null
+++ b/.changeset/silly-grapes-sleep.md
@@ -0,0 +1,5 @@
+---
+'@talend/eslint-config': patch
+---
+
+Fix issue with eslint config
diff --git a/.changeset/tricky-ties-scream.md b/.changeset/tricky-ties-scream.md
new file mode 100644
index 00000000000..821b4938cf5
--- /dev/null
+++ b/.changeset/tricky-ties-scream.md
@@ -0,0 +1,5 @@
+---
+'@talend/dynamic-cdn-webpack-plugin': minor
+---
+
+Add missing deps, adapt code to keep test working with pnpm and use custom eslint config to not have circular dependency
diff --git a/.changeset/weak-tips-own.md b/.changeset/weak-tips-own.md
new file mode 100644
index 00000000000..23293fcf16d
--- /dev/null
+++ b/.changeset/weak-tips-own.md
@@ -0,0 +1,5 @@
+---
+'@talend/scripts-cmf': patch
+---
+
+Add missing deps
diff --git a/fork/bootstrap-sass/package.json b/fork/bootstrap-sass/package.json
index bf65b31c98b..ce95508ff0f 100644
--- a/fork/bootstrap-sass/package.json
+++ b/fork/bootstrap-sass/package.json
@@ -38,5 +38,10 @@
},
"publishConfig": {
"access": "public"
+ },
+ "devDependencies": {
+ "@talend/eslint-config": "^13.0.0",
+ "@talend/eslint-plugin": "^1.1.0",
+ "eslint": "^8.53.0"
}
}
diff --git a/fork/dynamic-cdn-webpack-plugin/.eslintrc.json b/fork/dynamic-cdn-webpack-plugin/.eslintrc.json
index 8464e11418a..892f6e0fe8e 100644
--- a/fork/dynamic-cdn-webpack-plugin/.eslintrc.json
+++ b/fork/dynamic-cdn-webpack-plugin/.eslintrc.json
@@ -1,4 +1,16 @@
{
"root": true,
- "extends": "@talend"
+ "extends": ["eslint:recommended", "plugin:prettier/recommended", "plugin:import/recommended"],
+ "env": {
+ "es6": true,
+ "node": true,
+ "jasmine": true,
+ "jest": true
+ },
+ "parser": "@babel/eslint-parser",
+ "parserOptions": {
+ "ecmaVersion": 6,
+ "sourceType": "module",
+ "requireConfigFile": false
+ }
}
diff --git a/fork/dynamic-cdn-webpack-plugin/.gitignore b/fork/dynamic-cdn-webpack-plugin/.gitignore
index 7e0138d3532..a3cc0817958 100644
--- a/fork/dynamic-cdn-webpack-plugin/.gitignore
+++ b/fork/dynamic-cdn-webpack-plugin/.gitignore
@@ -4,3 +4,4 @@ test/fixtures/output
yarn.lock
.nyc_output
coverage
+!test/fixtures/app/node_modules
diff --git a/fork/dynamic-cdn-webpack-plugin/package.json b/fork/dynamic-cdn-webpack-plugin/package.json
index b6971d4ff81..79c41dee6f6 100644
--- a/fork/dynamic-cdn-webpack-plugin/package.json
+++ b/fork/dynamic-cdn-webpack-plugin/package.json
@@ -38,14 +38,17 @@
"dependencies": {
"@talend/module-to-cdn": "^9.10.0",
"read-pkg-up": "^7.0.1",
+ "semver": "^7.5.4",
"webpack-sources": "^3.2.3"
},
"peerDependencies": {
"webpack": "^5.89.0"
},
"devDependencies": {
+ "@babel/eslint-parser": "^7.23.3",
"all-contributors-cli": "^6.26.1",
"codecov": "^3.8.3",
+ "eslint": "^8.53.0",
"html-webpack-plugin": "^5.5.3",
"jest": "^29.7.0",
"mz": "^2.7.0",
diff --git a/fork/dynamic-cdn-webpack-plugin/src/find.js b/fork/dynamic-cdn-webpack-plugin/src/find.js
index 2d8cfed60d8..856e07e7edd 100644
--- a/fork/dynamic-cdn-webpack-plugin/src/find.js
+++ b/fork/dynamic-cdn-webpack-plugin/src/find.js
@@ -9,6 +9,7 @@ function findPackage(info) {
if (name.startsWith('@')) {
[scope, name] = info.name.split('/');
}
+ // eslint-disable-next-line no-use-before-define
return findPackages(scope, name).find(cwd => {
const {
packageJson: { version },
@@ -34,13 +35,13 @@ function findPackagesFromScopeFolder(scope, name, scopeFolderPath) {
// just add the path to the found list
return accu.concat(subFolderPath);
}
+
// the scope or package name is not the one we look for
// if there is a nested node modules folder, we dive into it for the search
const nestedNodeModulesPath = path.join(subFolderPath, 'node_modules');
if (fs.existsSync(nestedNodeModulesPath)) {
- return accu.concat(
- findPackagesFromNonScopeFolder(scope, name, nestedNodeModulesPath, []),
- );
+ // eslint-disable-next-line no-use-before-define
+ return accu.concat(findPackagesFromNonScopeFolder(scope, name, nestedNodeModulesPath, []));
}
return accu;
}, []);
@@ -54,29 +55,21 @@ function findPackagesFromNonScopeFolder(scope, name, nonScopeFolderPath) {
if (subFolder.name === '.bin') {
return accu;
}
- if (subFolder.name.startsWith('@')) {
+ // MAKE IT COMPATIBLE WITH PNPM (especially for test) WHEN deps is @talend/scripts-...
+ let regex = /@talend\/(scripts|babel|eslint)-.*\/node_modules$/;
+ if (subFolder.name.startsWith('@') && !regex.test(subFolder?.path)) {
// for scope folders, we need a special treatment to avoid getting scoped packages when we don't want a scoped one.
// ex: search for `classnames`, we don't want to find `@types/classnames` in the result
return accu.concat(
- findPackagesFromScopeFolder(
- scope,
- name,
- path.join(nonScopeFolderPath, subFolder.name),
- ),
+ findPackagesFromScopeFolder(scope, name, path.join(nonScopeFolderPath, subFolder.name)),
);
} else if (!scope && subFolder.name === name) {
// we want a NON scoped package, we are in a non scoped folder, and the names match
return accu.concat(path.join(nonScopeFolderPath, subFolder.name));
}
- const nestedNodeModulesPath = path.join(
- nonScopeFolderPath,
- subFolder.name,
- 'node_modules',
- );
+ const nestedNodeModulesPath = path.join(nonScopeFolderPath, subFolder.name, 'node_modules');
if (fs.existsSync(nestedNodeModulesPath)) {
- return accu.concat(
- findPackagesFromNonScopeFolder(scope, name, nestedNodeModulesPath),
- );
+ return accu.concat(findPackagesFromNonScopeFolder(scope, name, nestedNodeModulesPath));
}
return accu;
}, []);
@@ -88,7 +81,14 @@ function findPackages(scope, name, buff = []) {
if (roots === null) {
return buff;
}
- return buff.concat(...roots.map(root => findPackagesFromNonScopeFolder(scope, name, root)));
+ const result = buff.concat(
+ ...roots.map(root => findPackagesFromNonScopeFolder(scope, name, root)),
+ );
+ // Return a new Set to remove duplicate values: case possible with PNPM in GHA, due to pnpm/action-setup
+ // With the action, a folder setup-pnpm is created to manage the store and the script see it and try to scan it, and this generate duplicate entry
+ // Before we returned directly result of buff.concat...
+ // TODO: Manage pnpm installation manually (not reproduce the issue in this case but need to find solution to install global dep like surge)
+ return [...new Set(result)];
}
module.exports = {
diff --git a/fork/dynamic-cdn-webpack-plugin/src/find.test.js b/fork/dynamic-cdn-webpack-plugin/src/find.test.js
index 0d72fb96ba5..c2aedba0b99 100644
--- a/fork/dynamic-cdn-webpack-plugin/src/find.test.js
+++ b/fork/dynamic-cdn-webpack-plugin/src/find.test.js
@@ -17,12 +17,9 @@ describe('findPackages', () => {
'/node_modules/react/index.js': 'console.log("react");',
'/node_modules/react/package.json': '{"name": "react", "version": "16.14.0"}',
'/node_modules/@types/classnames/index.js': 'console.log("@types/classnames");',
- '/node_modules/@talend/react-components/index.js':
- 'console.log("@talend/react-components");',
- '/node_modules/@talend/react-components/node_modules/react/index.js':
- 'console.log("react");',
- '/node_modules/@talend/react-containers/index.js':
- 'console.log("@talend/react-containers");',
+ '/node_modules/@talend/react-components/index.js': 'console.log("@talend/react-components");',
+ '/node_modules/@talend/react-components/node_modules/react/index.js': 'console.log("react");',
+ '/node_modules/@talend/react-containers/index.js': 'console.log("@talend/react-containers");',
};
beforeEach(() => {
diff --git a/fork/dynamic-cdn-webpack-plugin/test/core.test.js b/fork/dynamic-cdn-webpack-plugin/test/core.test.js
index 0476a14dc31..b0715c3f9c6 100644
--- a/fork/dynamic-cdn-webpack-plugin/test/core.test.js
+++ b/fork/dynamic-cdn-webpack-plugin/test/core.test.js
@@ -55,9 +55,7 @@ describe('core', () => {
expect(output).toContain('module.exports = React');
const manifest = JSON.parse(
fs
- .readFileSync(
- path.resolve(__dirname, './fixtures/output/basic/app.js.dependencies.json'),
- )
+ .readFileSync(path.resolve(__dirname, './fixtures/output/basic/app.js.dependencies.json'))
.toString(),
);
expect(manifest.react.peerDependency).toBe('^15.6.1');
diff --git a/fork/dynamic-cdn-webpack-plugin/test/fixtures/app/node_modules/regenerator-runtime/index.js b/fork/dynamic-cdn-webpack-plugin/test/fixtures/app/node_modules/regenerator-runtime/index.js
new file mode 100644
index 00000000000..e27ca4c0420
--- /dev/null
+++ b/fork/dynamic-cdn-webpack-plugin/test/fixtures/app/node_modules/regenerator-runtime/index.js
@@ -0,0 +1 @@
+console.log('THIS IS regenerator-runtime too!');
diff --git a/fork/dynamic-cdn-webpack-plugin/test/fixtures/app/node_modules/regenerator-runtime/package.json b/fork/dynamic-cdn-webpack-plugin/test/fixtures/app/node_modules/regenerator-runtime/package.json
new file mode 100644
index 00000000000..281facc13b1
--- /dev/null
+++ b/fork/dynamic-cdn-webpack-plugin/test/fixtures/app/node_modules/regenerator-runtime/package.json
@@ -0,0 +1,6 @@
+{
+ "license": "MIT",
+ "main": "index.js",
+ "name": "regenerator-runtime",
+ "version": "0.13.4"
+}
diff --git a/fork/react-bootstrap/server/ModalSpec.js b/fork/react-bootstrap/server/ModalSpec.js
index b6db32f2e47..3d288929f4c 100644
--- a/fork/react-bootstrap/server/ModalSpec.js
+++ b/fork/react-bootstrap/server/ModalSpec.js
@@ -1,19 +1,20 @@
+// eslint-disable-next-line import/no-extraneous-dependencies
import { assert } from 'chai';
-import React from 'react';
+
import ReactDOMServer from 'react-dom/server';
-import Modal from '../../src/Modal';
+import Modal from '../src/Modal';
describe('Modal', () => {
it('Should be rendered on the server side', () => {
- let noOp = () => {};
+ const noOp = () => {};
assert.doesNotThrow(() =>
ReactDOMServer.renderToString(
Message
-
- )
+ ,
+ ),
);
});
});
diff --git a/packages/components/package.json b/packages/components/package.json
index e8d173f7fb2..cb0d319cc66 100644
--- a/packages/components/package.json
+++ b/packages/components/package.json
@@ -105,7 +105,6 @@
"react-dom": "^18.2.0",
"react-router-dom": "~6.3.0",
"react-i18next": "^13.4.1",
- "react-storybook-addon-props-combinations": "^1.1.0",
"react-test-renderer": "^18.2.0"
},
"peerDependencies": {
diff --git a/packages/components/src/Actions/ActionButton/Button.stories.js b/packages/components/src/Actions/ActionButton/Button.stories.js
index 69426a93a93..21e9af0390f 100644
--- a/packages/components/src/Actions/ActionButton/Button.stories.js
+++ b/packages/components/src/Actions/ActionButton/Button.stories.js
@@ -1,6 +1,6 @@
import { Component, Fragment } from 'react';
+
import { action } from '@storybook/addon-actions';
-import withPropsCombinations from 'react-storybook-addon-props-combinations';
import ActionButton from './ActionButton.component';
@@ -158,25 +158,3 @@ export const Default = () => (
);
-
-export const Combinations = withPropsCombinations(ActionButton, {
- label: ['Click me'],
- bsStyle: [
- 'default',
- 'primary',
- 'success',
- 'info',
- 'warning',
- 'danger',
- 'link',
- 'info btn-inverse',
- ],
- icon: ['talend-dataprep'],
- 'data-feature': ['my.feature'],
- onClick: [action('You clicked me')],
- hideLabel: [false, true],
- inProgress: [true, false],
- disabled: [false, true],
- tooltip: [true],
- tooltipLabel: ['Tooltip custom label'],
-});
diff --git a/packages/design-system/package.json b/packages/design-system/package.json
index b751312af6b..e28b53db716 100644
--- a/packages/design-system/package.json
+++ b/packages/design-system/package.json
@@ -93,6 +93,7 @@
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-helmet": "^6.1.0",
+ "react-hook-form": "^7.48.2",
"react-i18next": "^13.4.1",
"react-is": "^17.0.2",
"react-router-dom": "~6.3.0",
diff --git a/packages/playground/.talend/head.html b/packages/playground/.talend/head.html
new file mode 100644
index 00000000000..7224a9a22bc
--- /dev/null
+++ b/packages/playground/.talend/head.html
@@ -0,0 +1,8 @@
+
diff --git a/packages/playground/src/app/index.js b/packages/playground/src/app/index.js
index 74cc6ce5883..f8bdc5a3927 100644
--- a/packages/playground/src/app/index.js
+++ b/packages/playground/src/app/index.js
@@ -1,24 +1,26 @@
/* eslint-disable no-console */
+
/**
* Import theme.
* Being the first import is important, so that it is the default style
* and other style can override it
*/
-import '@talend/bootstrap-theme';
-import getRouter from '@talend/react-cmf-router';
+// eslint-disable-next-line @talend/import-depth
+import { initI18n } from './i18n';
+
+import '@talend/bootstrap-theme/dist/bootstrap.css';
import cmf from '@talend/react-cmf';
+import getRouter from '@talend/react-cmf-router';
import { AppLoader, IconsProvider as BaseIconsProvider } from '@talend/react-components';
import containersModule from '@talend/react-containers';
import ComponentForm from '@talend/react-containers/lib/ComponentForm';
-import { initI18n } from './i18n';
+
+import actions from './actions';
import ComponentFormSandbox from './components/ComponentFormSandbox';
+import { Dataviz } from './components/Dataviz';
import { FacetedSearchPlayground } from './components/FacetedSearch';
import { Icons } from './components/Icons';
-
import { LeaguesList } from './components/List';
-import { Dataviz } from './components/Dataviz';
-
-import actions from './actions';
// thanks ui-scripts
let basename = window.basename;
diff --git a/packages/playground/talend-scripts.json b/packages/playground/talend-scripts.json
index e6972c4435c..23c100bf93c 100644
--- a/packages/playground/talend-scripts.json
+++ b/packages/playground/talend-scripts.json
@@ -7,5 +7,6 @@
"development": "./webpack.config.dev.js",
"production": "./webpack.config.dev.js"
}
- }
+ },
+ "dynamic-cdn-webpack-plugin": false
}
diff --git a/tools/scripts-cmf/package.json b/tools/scripts-cmf/package.json
index 1805c1d281e..93f33e9ec3e 100644
--- a/tools/scripts-cmf/package.json
+++ b/tools/scripts-cmf/package.json
@@ -22,6 +22,7 @@
"devDependencies": {
"@babel/eslint-parser": "^7.23.3",
"@talend/eslint-config": "^13.0.0",
+ "@talend/eslint-plugin": "^1.1.0",
"eslint": "^8.53.0"
},
"repository": {
diff --git a/tools/scripts-config-eslint/.eslintrc.json b/tools/scripts-config-eslint/.eslintrc.json
index 4d89f3911b0..dc8a8cc02e7 100644
--- a/tools/scripts-config-eslint/.eslintrc.json
+++ b/tools/scripts-config-eslint/.eslintrc.json
@@ -88,9 +88,7 @@
"testing-library/custom-renders": "off",
"testing-library/custom-queries": "off",
"testing-library/no-node-access": "off",
- "testing-library/render-result-naming-convention": "off",
-
- "@typescript-eslint/no-explicit-any": 1
+ "testing-library/render-result-naming-convention": "off"
},
"overrides": [
{
diff --git a/tools/scripts-config-eslint/index.js b/tools/scripts-config-eslint/index.js
index abab172b5ec..abe905bc25d 100644
--- a/tools/scripts-config-eslint/index.js
+++ b/tools/scripts-config-eslint/index.js
@@ -37,7 +37,8 @@ if (isTS) {
rules: {
...config.rules,
'@typescript-eslint/indent': 0,
- '@typescript-eslint/no-var-requires': 0, // we have a lot of CJS files to lint
+ '@typescript-eslint/no-var-requires': 0, // we have a lot of CJS files to lint,
+ '@typescript-eslint/no-explicit-any': 1,
},
overrides: [
...(config.overrides || []),
diff --git a/tools/scripts-config-prettier/package.json b/tools/scripts-config-prettier/package.json
index 08dcdd1d50a..d7cbef3214a 100644
--- a/tools/scripts-config-prettier/package.json
+++ b/tools/scripts-config-prettier/package.json
@@ -25,6 +25,7 @@
"devDependencies": {
"@babel/eslint-parser": "^7.23.3",
"@talend/eslint-config": "^13.0.0",
+ "@talend/eslint-plugin": "^1.1.0",
"eslint": "^8.53.0"
}
}
diff --git a/tools/scripts-config-react-webpack/config/webpack.config.js b/tools/scripts-config-react-webpack/config/webpack.config.js
index 82752d8d296..2df686d9e58 100644
--- a/tools/scripts-config-react-webpack/config/webpack.config.js
+++ b/tools/scripts-config-react-webpack/config/webpack.config.js
@@ -197,6 +197,11 @@ async function getIndexTemplate(env, mode, indexTemplatePath, useInitiator = tru
window.Talend = { build: <%= JSON.stringify(htmlWebpackPlugin.files.jsMetadata || [])%>, cssBuild: <%= JSON.stringify(htmlWebpackPlugin.files.cssMetadata || [])%> };
${await inject.getMinified()}
`;
+ } else {
+ headScript = `${renderMeta()}
+ `;
}
const header = `${customHead}
diff --git a/yarn.lock b/yarn.lock
index a0bef70f42f..7c03fe1d459 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5857,11 +5857,6 @@ ansi-regex@^2.0.0:
resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df"
integrity sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA==
-ansi-regex@^3.0.0:
- version "3.0.1"
- resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.1.tgz#123d6479e92ad45ad897d4054e3c7ca7db4944e1"
- integrity sha512-+O9Jct8wf++lXxxFc4hc8LsjaSq0HFzzL7cVsw8pRDIPdjKD2mT4ytDZlLuSBZ4cLKZFXIrMGO7DbQCtMJJMKw==
-
ansi-regex@^5.0.1:
version "5.0.1"
resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304"
@@ -5872,7 +5867,7 @@ ansi-regex@^6.0.1:
resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-6.0.1.tgz#3183e38fae9a65d7cb5e53945cd5897d0260a06a"
integrity sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==
-ansi-styles@^3.2.0, ansi-styles@^3.2.1:
+ansi-styles@^3.2.1:
version "3.2.1"
resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d"
integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==
@@ -14226,11 +14221,6 @@ object-assign@^4, object-assign@^4.0.1, object-assign@^4.1.1:
resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
integrity sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==
-object-hash@^1.1.8:
- version "1.3.1"
- resolved "https://registry.yarnpkg.com/object-hash/-/object-hash-1.3.1.tgz#fde452098a951cb145f039bb7d455449ddc126df"
- integrity sha512-OSuu/pU4ENM9kmREg0BdNrUDIl1heYa4mBZacJc+vVWz4GtAwu7jO8s4AIt2aGRUTqxykpWzI3Oqnsm13tTMDA==
-
object-inspect@^1.13.1, object-inspect@^1.9.0:
version "1.13.1"
resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.13.1.tgz#b96c6109324ccfef6b12216a956ca4dc2ff94bc2"
@@ -15487,14 +15477,6 @@ pretty-error@^4.0.0:
lodash "^4.17.20"
renderkid "^3.0.0"
-pretty-format@^21.2.1:
- version "21.2.1"
- resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-21.2.1.tgz#ae5407f3cf21066cd011aa1ba5fce7b6a2eddb36"
- integrity sha512-ZdWPGYAnYfcVP8yKA3zFjCn8s4/17TeYH28MXuC8vTp0o21eXjbFGcOAXZEaDaOFJjc3h2qa7HQNHNshhvoh2A==
- dependencies:
- ansi-regex "^3.0.0"
- ansi-styles "^3.2.0"
-
pretty-format@^27.0.2:
version "27.5.1"
resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-27.5.1.tgz#2181879fdea51a7a5851fb39d920faa63f01d88e"
@@ -16131,14 +16113,6 @@ react-smooth@^2.0.4:
fast-equals "^5.0.0"
react-transition-group "2.9.0"
-react-storybook-addon-props-combinations@^1.1.0:
- version "1.1.0"
- resolved "https://registry.yarnpkg.com/react-storybook-addon-props-combinations/-/react-storybook-addon-props-combinations-1.1.0.tgz#22a61794cc3c106bf44be809af3c3241f6988e72"
- integrity sha512-gCHyLTkXthuP3wV5nQn3A6ZrBjYnRniRtVprSrq+7Vu9SX1jUhIEPvqdLdPVRmlq9rwgKAX2QVo6kNd95kZ7Hw==
- dependencies:
- object-hash "^1.1.8"
- pretty-format "^21.2.1"
-
react-style-singleton@^2.2.1:
version "2.2.1"
resolved "https://registry.yarnpkg.com/react-style-singleton/-/react-style-singleton-2.2.1.tgz#f99e420492b2d8f34d38308ff660b60d0b1205b4"