From 036cb8b250b842999d47327420b26450deb1cd28 Mon Sep 17 00:00:00 2001 From: Marc-Roig Date: Mon, 2 Jan 2023 16:48:02 +0100 Subject: [PATCH 01/27] filter by entity id when reordering components --- .../core/database/lib/entity-manager/regular-relations.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/core/database/lib/entity-manager/regular-relations.js b/packages/core/database/lib/entity-manager/regular-relations.js index bba3e9b72f..1aaece2217 100644 --- a/packages/core/database/lib/entity-manager/regular-relations.js +++ b/packages/core/database/lib/entity-manager/regular-relations.js @@ -338,7 +338,9 @@ const cleanOrderColumnsForInnoDB = async ({ .map(() => '?') .join(', ')}) ) AS inv_order - FROM ?? a`, + FROM ?? a + WHERE a.:joinColumnName: = :id + `, [ tempInvOrderTableName, joinTable.name, From 8ec567ef9f3c7c58810b391f9b27f11a89d2ab15 Mon Sep 17 00:00:00 2001 From: Marc-Roig Date: Tue, 3 Jan 2023 14:49:00 +0100 Subject: [PATCH 02/27] move mysql where clause to the correct query --- .../core/database/lib/entity-manager/regular-relations.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/core/database/lib/entity-manager/regular-relations.js b/packages/core/database/lib/entity-manager/regular-relations.js index 1aaece2217..d1711a32e4 100644 --- a/packages/core/database/lib/entity-manager/regular-relations.js +++ b/packages/core/database/lib/entity-manager/regular-relations.js @@ -296,7 +296,9 @@ const cleanOrderColumnsForInnoDB = async ({ FROM :joinTableName: b WHERE a.:orderColumnName: >= b.:orderColumnName: AND a.:joinColumnName: = b.:joinColumnName: AND a.:joinColumnName: = :id ) AS src_order - FROM :joinTableName: a`, + FROM :joinTableName: a + WHERE a.:joinColumnName: = :id + `, { tempOrderTableName, joinTableName: joinTable.name, @@ -338,9 +340,7 @@ const cleanOrderColumnsForInnoDB = async ({ .map(() => '?') .join(', ')}) ) AS inv_order - FROM ?? a - WHERE a.:joinColumnName: = :id - `, + FROM ?? a`, [ tempInvOrderTableName, joinTable.name, From d365106a1736579f366ee1414054b4a90c93ed6f Mon Sep 17 00:00:00 2001 From: Josh <37798644+joshuaellis@users.noreply.github.com> Date: Fri, 6 Jan 2023 11:54:09 +0000 Subject: [PATCH 03/27] chore: add browserlist spec --- packages/core/admin/package.json | 8 +++- packages/core/admin/webpack.config.js | 7 ++-- packages/core/helper-plugin/package.json | 7 +++- packages/core/helper-plugin/webpack.config.js | 3 +- yarn.lock | 37 +++++++++++++++++++ 5 files changed, 56 insertions(+), 6 deletions(-) diff --git a/packages/core/admin/package.json b/packages/core/admin/package.json index a1af8e9add..78da2a0edf 100644 --- a/packages/core/admin/package.json +++ b/packages/core/admin/package.json @@ -57,6 +57,7 @@ "babel-loader": "8.2.5", "babel-plugin-styled-components": "2.0.2", "bcryptjs": "2.4.3", + "browserslist-to-esbuild": "1.2.0", "chalk": "^4.1.1", "chokidar": "^3.5.1", "codemirror": "^5.65.11", @@ -160,5 +161,10 @@ ] } } - } + }, + "browserslist": [ + "last 3 major versions", + "Firefox ESR", + "last 2 Opera versions" + ] } diff --git a/packages/core/admin/webpack.config.js b/packages/core/admin/webpack.config.js index 5d9550d7ef..809534aae6 100644 --- a/packages/core/admin/webpack.config.js +++ b/packages/core/admin/webpack.config.js @@ -10,6 +10,7 @@ const { ESBuildMinifyPlugin } = require('esbuild-loader'); const WebpackBar = require('webpackbar'); const NodePolyfillPlugin = require('node-polyfill-webpack-plugin'); const ReactRefreshWebpackPlugin = require('@pmmmwh/react-refresh-webpack-plugin'); +const browserslistToEsbuild = require('browserslist-to-esbuild'); const alias = require('./webpack.alias'); const getClientEnvironment = require('./env'); @@ -88,7 +89,7 @@ module.exports = ({ exclude: excludeRegex, options: { loader: 'tsx', - target: 'es2015', + target: browserslistToEsbuild(), }, }, { @@ -152,7 +153,7 @@ module.exports = ({ loader: require.resolve('esbuild-loader'), options: { loader: 'jsx', - target: 'es2015', + target: browserslistToEsbuild(), }, }, }, @@ -165,7 +166,7 @@ module.exports = ({ loader: require.resolve('esbuild-loader'), options: { loader: 'jsx', - target: 'es2015', + target: browserslistToEsbuild(), }, }, }, diff --git a/packages/core/helper-plugin/package.json b/packages/core/helper-plugin/package.json index ff5ab6ef97..0dd22c8235 100644 --- a/packages/core/helper-plugin/package.json +++ b/packages/core/helper-plugin/package.json @@ -90,5 +90,10 @@ }, "peerDependencies": { "webpack": "^5.74.0" - } + }, + "browserslist": [ + "last 3 major versions", + "Firefox ESR", + "last 2 Opera versions" + ] } diff --git a/packages/core/helper-plugin/webpack.config.js b/packages/core/helper-plugin/webpack.config.js index 21f566db4b..8f93f1cf63 100644 --- a/packages/core/helper-plugin/webpack.config.js +++ b/packages/core/helper-plugin/webpack.config.js @@ -1,5 +1,6 @@ const webpack = require('webpack'); const { ESBuildMinifyPlugin } = require('esbuild-loader'); +const browserslistToEsbuild = require('browserslist-to-esbuild'); const packageJson = require('./package.json'); @@ -42,7 +43,7 @@ module.exports = { loader: require.resolve('esbuild-loader'), options: { loader: 'jsx', - target: 'es2015', + target: browserslistToEsbuild(), }, }, }, diff --git a/yarn.lock b/yarn.lock index 86c024e3a8..bd6d6cd322 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8414,6 +8414,13 @@ browserify-zlib@^0.2.0: dependencies: pako "~1.0.5" +browserslist-to-esbuild@1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/browserslist-to-esbuild/-/browserslist-to-esbuild-1.2.0.tgz#5c5b9ca73106da02e0168007396c4ec4c1e6d643" + integrity sha512-ftrrbI/VHBgEnmnSyhkqvQVMp6jAKybfs0qMIlm7SLBrQTGMsdCIP4q3BoKeLsZTBQllIQtY9kbxgRYV2WU47g== + dependencies: + browserslist "^4.17.3" + browserslist@^4.12.0, browserslist@^4.14.5: version "4.20.2" resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.20.2.tgz#567b41508757ecd904dab4d1c646c612cd3d4f88" @@ -8425,6 +8432,16 @@ browserslist@^4.12.0, browserslist@^4.14.5: node-releases "^2.0.2" picocolors "^1.0.0" +browserslist@^4.17.3: + version "4.21.4" + resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.21.4.tgz#e7496bbc67b9e39dd0f98565feccdcb0d4ff6987" + integrity sha512-CBHJJdDmgjl3daYjN5Cp5kbTf1mUhZoS+beLklHIvkOWscs83YAhLlF3Wsh/lciQYAcbBJgTOD44VtG31ZM4Hw== + dependencies: + caniuse-lite "^1.0.30001400" + electron-to-chromium "^1.4.251" + node-releases "^2.0.6" + update-browserslist-db "^1.0.9" + browserslist@^4.20.2: version "4.21.0" resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.21.0.tgz#7ab19572361a140ecd1e023e2c1ed95edda0cefe" @@ -8767,6 +8784,11 @@ caniuse-lite@^1.0.30001370: resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001373.tgz#2dc3bc3bfcb5d5a929bec11300883040d7b4b4be" integrity sha512-pJYArGHrPp3TUqQzFYRmP/lwJlj8RCbVe3Gd3eJQkAV8SAC6b19XS9BjMvRdvaS8RMkaTN8ZhoHP6S1y8zzwEQ== +caniuse-lite@^1.0.30001400: + version "1.0.30001442" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001442.tgz#40337f1cf3be7c637b061e2f78582dc1daec0614" + integrity sha512-239m03Pqy0hwxYPYR5JwOIxRJfLTWtle9FV8zosfV5pHg+/51uD4nxcUlM8+mWWGfwKtt8lJNHnD3cWw9VZ6ow== + capture-exit@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/capture-exit/-/capture-exit-2.0.0.tgz#fb953bfaebeb781f62898239dabb426d08a509a4" @@ -10664,6 +10686,11 @@ electron-to-chromium@^1.4.202: resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.208.tgz#ecb5b47c8cc212a43172ffc5ce50178a638a5d74" integrity sha512-diMr4t69FigAGUk2KovP0bygEtN/9AkqEVkzjEp0cu+zFFbZMVvwACpTTfuj1mAmFR5kNoSW8wGKDFWIvmThiQ== +electron-to-chromium@^1.4.251: + version "1.4.284" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.284.tgz#61046d1e4cab3a25238f6bf7413795270f125592" + integrity sha512-M8WEXFuKXMYMVr45fo8mq0wUrrJHheiKZf6BArTKk9ZBYCKJEOU5H8cdWgDT+qCVZf7Na4lVUaZsA+h6uA9+PA== + electron-to-chromium@^1.4.84: version "1.4.106" resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.106.tgz#e7a3bfa9d745dd9b9e597616cb17283cc349781a" @@ -18081,6 +18108,8 @@ path-case@^2.1.0: version "2.1.1" resolved "https://registry.yarnpkg.com/path-case/-/path-case-2.1.1.tgz#94b8037c372d3fe2906e465bb45e25d226e8eea5" integrity sha1-lLgDfDctP+KQbkZbtF4l0ibo7qU= + dependencies: + no-case "^2.2.0" path-dirname@^1.0.0: version "1.0.2" @@ -22259,6 +22288,14 @@ update-browserslist-db@^1.0.0, update-browserslist-db@^1.0.5: escalade "^3.1.1" picocolors "^1.0.0" +update-browserslist-db@^1.0.9: + version "1.0.10" + resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.0.10.tgz#0f54b876545726f17d00cd9a2561e6dade943ff3" + integrity sha512-OztqDenkfFkbSG+tRxBeAnCVPckDBcvibKd35yDONx6OU8N7sqgwc7rCbkJ/WcYtVRZ4ba68d6byhC21GFh7sQ== + dependencies: + escalade "^3.1.1" + picocolors "^1.0.0" + upper-case-first@^1.1.0, upper-case-first@^1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/upper-case-first/-/upper-case-first-1.1.2.tgz#5d79bedcff14419518fd2edb0a0507c9b6859115" From 210bce6ff069ed23ba25ab22c8ff3b8fc3e72973 Mon Sep 17 00:00:00 2001 From: Josh <37798644+joshuaellis@users.noreply.github.com> Date: Fri, 6 Jan 2023 15:48:39 +0000 Subject: [PATCH 04/27] refactor: use browserlistrc --- packages/core/admin/.browserslistrc | 3 +++ packages/core/admin/package.json | 7 +------ packages/core/helper-plugin/.browserslistrc | 3 +++ packages/core/helper-plugin/package.json | 7 +------ 4 files changed, 8 insertions(+), 12 deletions(-) create mode 100644 packages/core/admin/.browserslistrc create mode 100644 packages/core/helper-plugin/.browserslistrc diff --git a/packages/core/admin/.browserslistrc b/packages/core/admin/.browserslistrc new file mode 100644 index 0000000000..85956df65f --- /dev/null +++ b/packages/core/admin/.browserslistrc @@ -0,0 +1,3 @@ +last 3 major versions +Firefox ESR +last 2 Opera versions \ No newline at end of file diff --git a/packages/core/admin/package.json b/packages/core/admin/package.json index 78da2a0edf..e8922c3ad6 100644 --- a/packages/core/admin/package.json +++ b/packages/core/admin/package.json @@ -161,10 +161,5 @@ ] } } - }, - "browserslist": [ - "last 3 major versions", - "Firefox ESR", - "last 2 Opera versions" - ] + } } diff --git a/packages/core/helper-plugin/.browserslistrc b/packages/core/helper-plugin/.browserslistrc new file mode 100644 index 0000000000..85956df65f --- /dev/null +++ b/packages/core/helper-plugin/.browserslistrc @@ -0,0 +1,3 @@ +last 3 major versions +Firefox ESR +last 2 Opera versions \ No newline at end of file diff --git a/packages/core/helper-plugin/package.json b/packages/core/helper-plugin/package.json index 0dd22c8235..ff5ab6ef97 100644 --- a/packages/core/helper-plugin/package.json +++ b/packages/core/helper-plugin/package.json @@ -90,10 +90,5 @@ }, "peerDependencies": { "webpack": "^5.74.0" - }, - "browserslist": [ - "last 3 major versions", - "Firefox ESR", - "last 2 Opera versions" - ] + } } From 4d5f2fd152c65a79abbe842b715efad890469ca4 Mon Sep 17 00:00:00 2001 From: Josh <37798644+joshuaellis@users.noreply.github.com> Date: Wed, 11 Jan 2023 09:42:26 +0000 Subject: [PATCH 05/27] fix: use browserlist for minification --- packages/core/admin/webpack.config.js | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/packages/core/admin/webpack.config.js b/packages/core/admin/webpack.config.js index 809534aae6..b00be47c50 100644 --- a/packages/core/admin/webpack.config.js +++ b/packages/core/admin/webpack.config.js @@ -53,6 +53,8 @@ module.exports = ({ const excludeRegex = createPluginsExcludePath(pluginsPath); + const buildTarget = browserslistToEsbuild(); + return { mode: isProduction ? 'production' : 'development', bail: !!isProduction, @@ -73,7 +75,7 @@ module.exports = ({ minimize: optimize, minimizer: [ new ESBuildMinifyPlugin({ - target: 'es2015', + target: buildTarget, css: true, // Apply minification to CSS assets }), ], @@ -89,7 +91,7 @@ module.exports = ({ exclude: excludeRegex, options: { loader: 'tsx', - target: browserslistToEsbuild(), + target: buildTarget, }, }, { @@ -153,7 +155,7 @@ module.exports = ({ loader: require.resolve('esbuild-loader'), options: { loader: 'jsx', - target: browserslistToEsbuild(), + target: buildTarget, }, }, }, @@ -166,7 +168,7 @@ module.exports = ({ loader: require.resolve('esbuild-loader'), options: { loader: 'jsx', - target: browserslistToEsbuild(), + target: buildTarget, }, }, }, From b7b19c86584e91a5dec833afe07c52f049e9fb3c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 11 Jan 2023 16:56:58 +0000 Subject: [PATCH 06/27] chore(deps): bump @pmmmwh/react-refresh-webpack-plugin Bumps [@pmmmwh/react-refresh-webpack-plugin](https://github.com/pmmmwh/react-refresh-webpack-plugin) from 0.5.7 to 0.5.10. - [Release notes](https://github.com/pmmmwh/react-refresh-webpack-plugin/releases) - [Changelog](https://github.com/pmmmwh/react-refresh-webpack-plugin/blob/main/CHANGELOG.md) - [Commits](https://github.com/pmmmwh/react-refresh-webpack-plugin/compare/v0.5.7...v0.5.10) --- updated-dependencies: - dependency-name: "@pmmmwh/react-refresh-webpack-plugin" dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- packages/core/admin/package.json | 2 +- yarn.lock | 28 ++++++++++++++-------------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/packages/core/admin/package.json b/packages/core/admin/package.json index f21da2cb58..1fe4807bc4 100644 --- a/packages/core/admin/package.json +++ b/packages/core/admin/package.json @@ -45,7 +45,7 @@ "@babel/runtime": "7.18.9", "@casl/ability": "^5.4.3", "@fingerprintjs/fingerprintjs": "3.3.3", - "@pmmmwh/react-refresh-webpack-plugin": "0.5.7", + "@pmmmwh/react-refresh-webpack-plugin": "0.5.10", "@strapi/babel-plugin-switch-ee-ce": "4.5.6", "@strapi/design-system": "1.4.1", "@strapi/helper-plugin": "4.5.6", diff --git a/yarn.lock b/yarn.lock index 698b1b245c..c167125cec 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3652,18 +3652,18 @@ node-addon-api "^3.2.1" node-gyp-build "^4.3.0" -"@pmmmwh/react-refresh-webpack-plugin@0.5.7", "@pmmmwh/react-refresh-webpack-plugin@^0.5.3": - version "0.5.7" - resolved "https://registry.yarnpkg.com/@pmmmwh/react-refresh-webpack-plugin/-/react-refresh-webpack-plugin-0.5.7.tgz#58f8217ba70069cc6a73f5d7e05e85b458c150e2" - integrity sha512-bcKCAzF0DV2IIROp9ZHkRJa6O4jy7NlnHdWL3GmcUxYWNjLXkK5kfELELwEfSP5hXPfVL/qOGMAROuMQb9GG8Q== +"@pmmmwh/react-refresh-webpack-plugin@0.5.10", "@pmmmwh/react-refresh-webpack-plugin@^0.5.3": + version "0.5.10" + resolved "https://registry.yarnpkg.com/@pmmmwh/react-refresh-webpack-plugin/-/react-refresh-webpack-plugin-0.5.10.tgz#2eba163b8e7dbabb4ce3609ab5e32ab63dda3ef8" + integrity sha512-j0Ya0hCFZPd4x40qLzbhGsh9TMtdb+CJQiso+WxLOPNasohq9cc5SNUcwsZaRH6++Xh91Xkm/xHCkuIiIu0LUA== dependencies: ansi-html-community "^0.0.8" common-path-prefix "^3.0.0" - core-js-pure "^3.8.1" + core-js-pure "^3.23.3" error-stack-parser "^2.0.6" find-up "^5.0.0" html-entities "^2.1.0" - loader-utils "^2.0.0" + loader-utils "^2.0.4" schema-utils "^3.0.0" source-map "^0.7.3" @@ -9196,10 +9196,10 @@ core-js-compat@^3.8.1: dependencies: browserslist "^4.21.3" -core-js-pure@^3.20.2, core-js-pure@^3.8.1: - version "3.24.1" - resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.24.1.tgz#8839dde5da545521bf282feb7dc6d0b425f39fd3" - integrity sha512-r1nJk41QLLPyozHUUPmILCEMtMw24NG4oWK6RbsDdjzQgg9ZvrUsPBj1MnG0wXXp1DCDU6j+wUvEmBSrtRbLXg== +core-js-pure@^3.20.2, core-js-pure@^3.23.3: + version "3.27.1" + resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.27.1.tgz#ede4a6b8440585c7190062757069c01d37a19dca" + integrity sha512-BS2NHgwwUppfeoqOXqi08mUqS5FiZpuRuJJpKsaME7kJz0xxuk0xkhDdfMIlP/zLa80krBqss1LtD7f889heAw== core-js@3.26.1, core-js@^3.0.4, core-js@^3.6.5, core-js@^3.8.2: version "3.26.1" @@ -15043,10 +15043,10 @@ loader-utils@^1.2.3: emojis-list "^3.0.0" json5 "^1.0.1" -loader-utils@^2.0.0: - version "2.0.2" - resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-2.0.2.tgz#d6e3b4fb81870721ae4e0868ab11dd638368c129" - integrity sha512-TM57VeHptv569d/GKh6TAYdzKblwDNiumOdkFnejjD0XwTH87K90w3O7AiJRqdQoXygvi1VQTJTLGhJl7WqA7A== +loader-utils@^2.0.0, loader-utils@^2.0.4: + version "2.0.4" + resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-2.0.4.tgz#8b5cb38b5c34a9a018ee1fc0e6a066d1dfcc528c" + integrity sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw== dependencies: big.js "^5.2.2" emojis-list "^3.0.0" From 8282fc190068f5bd37e2664a6a2be66a92d479f8 Mon Sep 17 00:00:00 2001 From: Gustav Hansen Date: Thu, 12 Jan 2023 13:03:53 +0100 Subject: [PATCH 07/27] Chore: Update axios to 1.2.2 --- packages/core/admin/package.json | 2 +- packages/core/helper-plugin/package.json | 2 +- yarn.lock | 19 ++++--------------- 3 files changed, 6 insertions(+), 17 deletions(-) diff --git a/packages/core/admin/package.json b/packages/core/admin/package.json index f21da2cb58..eef242c6fb 100644 --- a/packages/core/admin/package.json +++ b/packages/core/admin/package.json @@ -53,7 +53,7 @@ "@strapi/permissions": "4.5.6", "@strapi/typescript-utils": "4.5.6", "@strapi/utils": "4.5.6", - "axios": "1.2.1", + "axios": "1.2.2", "babel-loader": "8.2.5", "babel-plugin-styled-components": "2.0.2", "bcryptjs": "2.4.3", diff --git a/packages/core/helper-plugin/package.json b/packages/core/helper-plugin/package.json index 3340b9ec92..1f93ae3d5c 100644 --- a/packages/core/helper-plugin/package.json +++ b/packages/core/helper-plugin/package.json @@ -39,7 +39,7 @@ "watch": "yarn create:index && cross-env NODE_ENV=development webpack-cli -w" }, "dependencies": { - "axios": "1.2.1", + "axios": "1.2.2", "date-fns": "2.29.3", "formik": "^2.2.6", "immer": "9.0.6", diff --git a/yarn.lock b/yarn.lock index 698b1b245c..ec35a5b426 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7374,10 +7374,10 @@ axe-core@^4.4.3: resolved "https://registry.yarnpkg.com/axe-core/-/axe-core-4.4.3.tgz#11c74d23d5013c0fa5d183796729bc3482bd2f6f" integrity sha512-32+ub6kkdhhWick/UjvEwRchgoetXqTK14INLqbGm5U2TzBkBNF3nQtLYm8ovxSkQWArjEQvftCKryjZaATu3w== -axios@1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/axios/-/axios-1.2.1.tgz#44cf04a3c9f0c2252ebd85975361c026cb9f864a" - integrity sha512-I88cFiGu9ryt/tfVEi4kX2SITsvDddTajXTOFmt2uK1ZVA8LytjtdeyefdQWEf5PU8w+4SSJDoYnggflB5tW4A== +axios@1.2.2, axios@^1.0.0: + version "1.2.2" + resolved "https://registry.yarnpkg.com/axios/-/axios-1.2.2.tgz#72681724c6e6a43a9fea860fc558127dbe32f9f1" + integrity sha512-bz/J4gS2S3I7mpN/YZfGFTqhXTYzRho8Ay38w2otuuDR322KzFIWm/4W2K6gIwvWaws5n+mnb7D1lN9uD+QH6Q== dependencies: follow-redirects "^1.15.0" form-data "^4.0.0" @@ -7390,15 +7390,6 @@ axios@^0.26.0: dependencies: follow-redirects "^1.14.8" -axios@^1.0.0: - version "1.2.2" - resolved "https://registry.yarnpkg.com/axios/-/axios-1.2.2.tgz#72681724c6e6a43a9fea860fc558127dbe32f9f1" - integrity sha512-bz/J4gS2S3I7mpN/YZfGFTqhXTYzRho8Ay38w2otuuDR322KzFIWm/4W2K6gIwvWaws5n+mnb7D1lN9uD+QH6Q== - dependencies: - follow-redirects "^1.15.0" - form-data "^4.0.0" - proxy-from-env "^1.1.0" - axobject-query@^2.2.0: version "2.2.0" resolved "https://registry.yarnpkg.com/axobject-query/-/axobject-query-2.2.0.tgz#943d47e10c0b704aa42275e20edf3722648989be" @@ -17465,8 +17456,6 @@ path-case@^2.1.0: version "2.1.1" resolved "https://registry.yarnpkg.com/path-case/-/path-case-2.1.1.tgz#94b8037c372d3fe2906e465bb45e25d226e8eea5" integrity sha1-lLgDfDctP+KQbkZbtF4l0ibo7qU= - dependencies: - no-case "^2.2.0" path-dirname@^1.0.0: version "1.0.2" From 01166e7c83aabb8da936b85445742e1d53fce57c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 12 Jan 2023 12:19:22 +0000 Subject: [PATCH 08/27] chore(deps): bump @fingerprintjs/fingerprintjs from 3.3.3 to 3.3.6 Bumps [@fingerprintjs/fingerprintjs](https://github.com/fingerprintjs/fingerprintjs) from 3.3.3 to 3.3.6. - [Release notes](https://github.com/fingerprintjs/fingerprintjs/releases) - [Commits](https://github.com/fingerprintjs/fingerprintjs/compare/v3.3.3...v3.3.6) --- updated-dependencies: - dependency-name: "@fingerprintjs/fingerprintjs" dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- packages/core/admin/package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/core/admin/package.json b/packages/core/admin/package.json index 1fe4807bc4..3388204e3f 100644 --- a/packages/core/admin/package.json +++ b/packages/core/admin/package.json @@ -44,7 +44,7 @@ "@babel/preset-react": "7.18.6", "@babel/runtime": "7.18.9", "@casl/ability": "^5.4.3", - "@fingerprintjs/fingerprintjs": "3.3.3", + "@fingerprintjs/fingerprintjs": "3.3.6", "@pmmmwh/react-refresh-webpack-plugin": "0.5.10", "@strapi/babel-plugin-switch-ee-ce": "4.5.6", "@strapi/design-system": "1.4.1", diff --git a/yarn.lock b/yarn.lock index c167125cec..72a8a723b1 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1889,10 +1889,10 @@ minimatch "^3.1.2" strip-json-comments "^3.1.1" -"@fingerprintjs/fingerprintjs@3.3.3": - version "3.3.3" - resolved "https://registry.yarnpkg.com/@fingerprintjs/fingerprintjs/-/fingerprintjs-3.3.3.tgz#ead445032c92a79d5f585953019402ed223edc7d" - integrity sha512-HH6KqZnopF3NIXypYG4f2qxoSRmGCSzp81wJMfWjSTtvsX3cAg12RFJcm+a6Az3XadcZUrXKW3p5Dv0wyCUeuA== +"@fingerprintjs/fingerprintjs@3.3.6": + version "3.3.6" + resolved "https://registry.yarnpkg.com/@fingerprintjs/fingerprintjs/-/fingerprintjs-3.3.6.tgz#4c3f1726dc0cb10b915cfce78d9471b38cd809bd" + integrity sha512-Inh0OoFVzO2PLvrUF8RZhY9NVDdg9DJHQ5YlvXhrGtQxSPzy2smS3TWzLAi+zlHSJNHSvi+1zYayLen2lGxjdA== dependencies: tslib "^2.0.1" From 8f542f4be5790deb878e301b0521ab9680a8d619 Mon Sep 17 00:00:00 2001 From: Julie Plantey Date: Thu, 12 Jan 2023 17:17:57 +0100 Subject: [PATCH 09/27] bump DS to 1.4.2 --- .../components/Wysiwyg/tests/index.test.js | 2 +- packages/core/admin/package.json | 4 ++-- packages/core/helper-plugin/package.json | 4 ++-- yarn.lock | 16 ++++++++-------- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/packages/core/admin/admin/src/content-manager/components/Wysiwyg/tests/index.test.js b/packages/core/admin/admin/src/content-manager/components/Wysiwyg/tests/index.test.js index 4432f89289..6950311407 100644 --- a/packages/core/admin/admin/src/content-manager/components/Wysiwyg/tests/index.test.js +++ b/packages/core/admin/admin/src/content-manager/components/Wysiwyg/tests/index.test.js @@ -973,7 +973,7 @@ describe('Wysiwyg render and actions buttons', () => { fill="none" focusable="false" height="1em" - viewBox="0 0 24" + viewBox="0 0 24 24" width="1em" xmlns="http://www.w3.org/2000/svg" > diff --git a/packages/core/admin/package.json b/packages/core/admin/package.json index 1fe4807bc4..724b6c59a5 100644 --- a/packages/core/admin/package.json +++ b/packages/core/admin/package.json @@ -47,9 +47,9 @@ "@fingerprintjs/fingerprintjs": "3.3.3", "@pmmmwh/react-refresh-webpack-plugin": "0.5.10", "@strapi/babel-plugin-switch-ee-ce": "4.5.6", - "@strapi/design-system": "1.4.1", + "@strapi/design-system": "1.4.2", "@strapi/helper-plugin": "4.5.6", - "@strapi/icons": "1.4.1", + "@strapi/icons": "1.4.2", "@strapi/permissions": "4.5.6", "@strapi/typescript-utils": "4.5.6", "@strapi/utils": "4.5.6", diff --git a/packages/core/helper-plugin/package.json b/packages/core/helper-plugin/package.json index 3340b9ec92..9b458c3049 100644 --- a/packages/core/helper-plugin/package.json +++ b/packages/core/helper-plugin/package.json @@ -64,8 +64,8 @@ "@storybook/builder-webpack5": "6.5.15", "@storybook/manager-webpack5": "6.5.15", "@storybook/react": "^6.5.10", - "@strapi/design-system": "1.4.1", - "@strapi/icons": "1.4.1", + "@strapi/design-system": "1.4.2", + "@strapi/icons": "1.4.2", "@testing-library/react": "12.1.4", "@testing-library/react-hooks": "8.0.1", "cross-env": "^7.0.3", diff --git a/yarn.lock b/yarn.lock index c167125cec..34db8147e8 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5316,10 +5316,10 @@ regenerator-runtime "^0.13.7" resolve-from "^5.0.0" -"@strapi/design-system@1.4.1": - version "1.4.1" - resolved "https://registry.yarnpkg.com/@strapi/design-system/-/design-system-1.4.1.tgz#f2daa634eaa4f22ac29e6b2b86791187aaa9887e" - integrity sha512-olDi71FFQFU9luSC0yvIwB0i77Y/JIvt9HyLcUhK/rsRyiaiNzplAe5hi5aaphhJv++9rML2nSiwgfX/V4a5ZA== +"@strapi/design-system@1.4.2": + version "1.4.2" + resolved "https://registry.yarnpkg.com/@strapi/design-system/-/design-system-1.4.2.tgz#fbbce86ca616f3dd33c811029bfbc90e1fa38a12" + integrity sha512-0zH2c2t2XFKhw7N7VCmH4goaFZi6bKseyMtrb15oo4WYJzqZgTR/ER88L6gaDserW5xFu97yXHkYz+Ammk1exQ== dependencies: "@floating-ui/react-dom" "^1.0.0" "@internationalized/number" "^3.1.1" @@ -5349,10 +5349,10 @@ optionalDependencies: typescript "^4.6.2" -"@strapi/icons@1.4.1": - version "1.4.1" - resolved "https://registry.yarnpkg.com/@strapi/icons/-/icons-1.4.1.tgz#121a2f68f65ac1b29031b7ab1e9774e17dbaeead" - integrity sha512-bwVM5NVXUJEUbbeelOVEslDIbGdZAGSwFSdV6Erb2Cwp3gtYB5Hfu4bRbVPeSwRWsd3IseC0USDpOQ3PzLK1qg== +"@strapi/icons@1.4.2": + version "1.4.2" + resolved "https://registry.yarnpkg.com/@strapi/icons/-/icons-1.4.2.tgz#29e52aef88e9c5b125f296af9e861bc71433e16e" + integrity sha512-V56sfBItnQ+lU/fU+nCYSQDjBK57EOxWKeM99tBx0RYhZzMJ5gRplWKsNRl/JhErVEPait0Dlv73EaixhdTyhw== "@stylelint/postcss-css-in-js@^0.37.2": version "0.37.3" From 8fe799beb83ed3d5d058b17453f11af1ed09ce28 Mon Sep 17 00:00:00 2001 From: Simone Taeggi Date: Fri, 13 Jan 2023 09:33:18 +0100 Subject: [PATCH 10/27] revert jest-styled-components dependency --- packages/admin-test-utils/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/admin-test-utils/package.json b/packages/admin-test-utils/package.json index 60ee8d2556..1e29f42956 100644 --- a/packages/admin-test-utils/package.json +++ b/packages/admin-test-utils/package.json @@ -20,7 +20,7 @@ "devDependencies": { "@testing-library/jest-dom": "5.16.5", "core-js": "3.26.1", - "jest-styled-components": "7.1.1", + "jest-styled-components": "7.0.2", "react": "^17.0.2", "react-dom": "^17.0.2", "react-is": "^17.0.2", From 8c8e0391b26db2d4d8e1f29351210441c7f6f1d7 Mon Sep 17 00:00:00 2001 From: Simone Taeggi Date: Fri, 13 Jan 2023 09:40:28 +0100 Subject: [PATCH 11/27] update snapshots --- .../GuidedTour/Homepage/tests/index.test.js | 12 +- .../GuidedTour/Modal/tests/index.test.js | 12 +- .../tests/__snapshots__/index.test.js.snap | 6 +- .../components/Wysiwyg/tests/index.test.js | 6 +- .../tests/__snapshots__/index.test.js.snap | 36 +- .../pages/EditView/Header/tests/index.test.js | 6 +- .../tests/__snapshots__/index.test.js.snap | 12 +- .../pages/NoContentType/tests/index.test.js | 6 +- .../components/Login/tests/BaseLogin.test.js | 6 +- .../components/Oops/tests/index.test.js | 6 +- .../components/Register/tests/index.test.js | 12 +- .../ResetPassword/tests/index.test.js | 12 +- .../src/pages/HomePage/tests/index.test.js | 12 +- .../InternalErrorPage/tests/index.test.js | 6 +- .../tests/__snapshots__/index.test.js.snap | 18 +- .../tests/__snapshots__/plugins.test.js.snap | 18 +- .../__snapshots__/providers.test.js.snap | 18 +- .../pages/NotFoundPage/tests/index.test.js | 6 +- .../tests/__snapshots__/index.test.js.snap | 6 +- .../tests/__snapshots__/index.test.js.snap | 42 +- .../ApiTokens/ListView/tests/index.test.js | 6 +- .../tests/__snapshots__/index.test.js.snap | 2112 +++++++++++------ .../ApplicationInfosPage/tests/index.test.js | 6 +- .../tests/__snapshots__/index.test.js.snap | 12 +- .../pages/Roles/ListPage/tests/index.test.js | 6 +- .../tests/__snapshots__/index.test.js.snap | 2 +- .../pages/Users/ListPage/tests/index.test.js | 14 +- .../Webhooks/ListView/tests/index.test.js | 6 +- .../src/pages/UseCasePage/tests/index.test.js | 12 +- .../tests/__snapshots__/index.test.js.snap | 6 +- .../tests/__snapshots__/index.test.js.snap | 12 +- .../tests/__snapshots__/index.test.js.snap | 18 +- .../src/pages/Settings/tests/index.test.js | 6 +- .../tests/__snapshots__/index.test.js.snap | 4 +- .../PaginationURLQuery/tests/index.test.js | 2 +- .../tests/__snapshots__/index.test.js.snap | 8 +- .../__snapshots__/AssetGridList.test.js.snap | 4 + .../tests/__snapshots__/index.test.js.snap | 6 +- .../__snapshots__/BulkMoveDialog.test.js.snap | 12 +- .../EditAssetDialog.test.js.snap | 18 +- .../RemoveAssetDialog.test.js.snap | 12 +- .../tests/__snapshots__/index.test.js.snap | 18 +- .../EditFolderDialog.test.js.snap | 12 +- .../__snapshots__/SelectTree.test.js.snap | 51 +- .../FromComputerForm.test.js.snap | 12 +- .../PendingAssetStep.test.js.snap | 12 +- .../UploadAssetDialog.test.js.snap | 1174 ++++----- .../ConfigureTheView.test.js.snap | 6 +- .../__snapshots__/BulkActions.test.js.snap | 12 +- .../BulkDeleteButton.test.js.snap | 6 +- .../__snapshots__/BulkMoveButton.test.js.snap | 6 +- .../tests/__snapshots__/Header.test.js.snap | 12 +- .../pages/SettingsPage/tests/index.test.js | 6 +- .../AdvancedSettings/tests/index.test.js | 6 +- .../Roles/CreatePage/tests/index.test.js | 12 +- .../pages/Roles/EditPage/tests/index.test.js | 12 +- .../pages/Roles/ListPage/tests/index.test.js | 6 +- yarn.lock | 22 +- 58 files changed, 2372 insertions(+), 1555 deletions(-) diff --git a/packages/core/admin/admin/src/components/GuidedTour/Homepage/tests/index.test.js b/packages/core/admin/admin/src/components/GuidedTour/Homepage/tests/index.test.js index cfd9433923..857ee7a4e7 100644 --- a/packages/core/admin/admin/src/components/GuidedTour/Homepage/tests/index.test.js +++ b/packages/core/admin/admin/src/components/GuidedTour/Homepage/tests/index.test.js @@ -339,7 +339,8 @@ describe('GuidedTour Homepage', () => { color: #666687; } - .c24[aria-disabled='true'] svg > g,.c24[aria-disabled='true'] svg path { + .c24[aria-disabled='true'] svg > g, + .c24[aria-disabled='true'] svg path { fill: #666687; } @@ -352,7 +353,8 @@ describe('GuidedTour Homepage', () => { color: #666687; } - .c24[aria-disabled='true']:active svg > g,.c24[aria-disabled='true']:active svg path { + .c24[aria-disabled='true']:active svg > g, + .c24[aria-disabled='true']:active svg path { fill: #666687; } @@ -410,7 +412,8 @@ describe('GuidedTour Homepage', () => { color: #666687; } - .c17[aria-disabled='true'] svg > g,.c17[aria-disabled='true'] svg path { + .c17[aria-disabled='true'] svg > g, + .c17[aria-disabled='true'] svg path { fill: #666687; } @@ -423,7 +426,8 @@ describe('GuidedTour Homepage', () => { color: #666687; } - .c17[aria-disabled='true']:active svg > g,.c17[aria-disabled='true']:active svg path { + .c17[aria-disabled='true']:active svg > g, + .c17[aria-disabled='true']:active svg path { fill: #666687; } diff --git a/packages/core/admin/admin/src/components/GuidedTour/Modal/tests/index.test.js b/packages/core/admin/admin/src/components/GuidedTour/Modal/tests/index.test.js index 64daa47936..6ef1b6b077 100644 --- a/packages/core/admin/admin/src/components/GuidedTour/Modal/tests/index.test.js +++ b/packages/core/admin/admin/src/components/GuidedTour/Modal/tests/index.test.js @@ -357,7 +357,8 @@ describe('', () => { color: #666687; } - .c26[aria-disabled='true'] svg > g,.c26[aria-disabled='true'] svg path { + .c26[aria-disabled='true'] svg > g, + .c26[aria-disabled='true'] svg path { fill: #666687; } @@ -370,7 +371,8 @@ describe('', () => { color: #666687; } - .c26[aria-disabled='true']:active svg > g,.c26[aria-disabled='true']:active svg path { + .c26[aria-disabled='true']:active svg > g, + .c26[aria-disabled='true']:active svg path { fill: #666687; } @@ -427,7 +429,8 @@ describe('', () => { color: #666687; } - .c29[aria-disabled='true'] svg > g,.c29[aria-disabled='true'] svg path { + .c29[aria-disabled='true'] svg > g, + .c29[aria-disabled='true'] svg path { fill: #666687; } @@ -440,7 +443,8 @@ describe('', () => { color: #666687; } - .c29[aria-disabled='true']:active svg > g,.c29[aria-disabled='true']:active svg path { + .c29[aria-disabled='true']:active svg > g, + .c29[aria-disabled='true']:active svg path { fill: #666687; } diff --git a/packages/core/admin/admin/src/content-manager/components/DynamicTable/CellContent/RelationMultiple/tests/__snapshots__/index.test.js.snap b/packages/core/admin/admin/src/content-manager/components/DynamicTable/CellContent/RelationMultiple/tests/__snapshots__/index.test.js.snap index 35c51cbf08..c4b9541e50 100644 --- a/packages/core/admin/admin/src/content-manager/components/DynamicTable/CellContent/RelationMultiple/tests/__snapshots__/index.test.js.snap +++ b/packages/core/admin/admin/src/content-manager/components/DynamicTable/CellContent/RelationMultiple/tests/__snapshots__/index.test.js.snap @@ -172,7 +172,8 @@ exports[`DynamicTabe / Cellcontent / RelationMultiple renders and matches the sn color: #666687; } -.c2[aria-disabled='true'] svg > g,.c2[aria-disabled='true'] svg path { +.c2[aria-disabled='true'] svg > g, +.c2[aria-disabled='true'] svg path { fill: #666687; } @@ -185,7 +186,8 @@ exports[`DynamicTabe / Cellcontent / RelationMultiple renders and matches the sn color: #666687; } -.c2[aria-disabled='true']:active svg > g,.c2[aria-disabled='true']:active svg path { +.c2[aria-disabled='true']:active svg > g, +.c2[aria-disabled='true']:active svg path { fill: #666687; } diff --git a/packages/core/admin/admin/src/content-manager/components/Wysiwyg/tests/index.test.js b/packages/core/admin/admin/src/content-manager/components/Wysiwyg/tests/index.test.js index 4432f89289..2610f8fb0c 100644 --- a/packages/core/admin/admin/src/content-manager/components/Wysiwyg/tests/index.test.js +++ b/packages/core/admin/admin/src/content-manager/components/Wysiwyg/tests/index.test.js @@ -308,7 +308,8 @@ describe('Wysiwyg render and actions buttons', () => { color: #666687; } - .c27[aria-disabled='true'] svg > g,.c27[aria-disabled='true'] svg path { + .c27[aria-disabled='true'] svg > g, + .c27[aria-disabled='true'] svg path { fill: #666687; } @@ -321,7 +322,8 @@ describe('Wysiwyg render and actions buttons', () => { color: #666687; } - .c27[aria-disabled='true']:active svg > g,.c27[aria-disabled='true']:active svg path { + .c27[aria-disabled='true']:active svg > g, + .c27[aria-disabled='true']:active svg path { fill: #666687; } diff --git a/packages/core/admin/admin/src/content-manager/pages/EditSettingsView/tests/__snapshots__/index.test.js.snap b/packages/core/admin/admin/src/content-manager/pages/EditSettingsView/tests/__snapshots__/index.test.js.snap index cff245224c..a826ae9ecc 100644 --- a/packages/core/admin/admin/src/content-manager/pages/EditSettingsView/tests/__snapshots__/index.test.js.snap +++ b/packages/core/admin/admin/src/content-manager/pages/EditSettingsView/tests/__snapshots__/index.test.js.snap @@ -349,7 +349,8 @@ exports[`EditSettingsView renders and matches the snapshot 1`] = ` color: #666687; } -.c13[aria-disabled='true'] svg > g,.c13[aria-disabled='true'] svg path { +.c13[aria-disabled='true'] svg > g, +.c13[aria-disabled='true'] svg path { fill: #666687; } @@ -362,7 +363,8 @@ exports[`EditSettingsView renders and matches the snapshot 1`] = ` color: #666687; } -.c13[aria-disabled='true']:active svg > g,.c13[aria-disabled='true']:active svg path { +.c13[aria-disabled='true']:active svg > g, +.c13[aria-disabled='true']:active svg path { fill: #666687; } @@ -428,7 +430,8 @@ exports[`EditSettingsView renders and matches the snapshot 1`] = ` color: #666687; } -.c56[aria-disabled='true'] svg > g,.c56[aria-disabled='true'] svg path { +.c56[aria-disabled='true'] svg > g, +.c56[aria-disabled='true'] svg path { fill: #666687; } @@ -441,7 +444,8 @@ exports[`EditSettingsView renders and matches the snapshot 1`] = ` color: #666687; } -.c56[aria-disabled='true']:active svg > g,.c56[aria-disabled='true']:active svg path { +.c56[aria-disabled='true']:active svg > g, +.c56[aria-disabled='true']:active svg path { fill: #666687; } @@ -691,7 +695,8 @@ exports[`EditSettingsView renders and matches the snapshot 1`] = ` color: #666687; } -.c39[aria-disabled='true'] svg > g,.c39[aria-disabled='true'] svg path { +.c39[aria-disabled='true'] svg > g, +.c39[aria-disabled='true'] svg path { fill: #666687; } @@ -704,7 +709,8 @@ exports[`EditSettingsView renders and matches the snapshot 1`] = ` color: #666687; } -.c39[aria-disabled='true']:active svg > g,.c39[aria-disabled='true']:active svg path { +.c39[aria-disabled='true']:active svg > g, +.c39[aria-disabled='true']:active svg path { fill: #666687; } @@ -1807,7 +1813,8 @@ exports[`EditSettingsView should add field 1`] = ` color: #666687; } -.c13[aria-disabled='true'] svg > g,.c13[aria-disabled='true'] svg path { +.c13[aria-disabled='true'] svg > g, +.c13[aria-disabled='true'] svg path { fill: #666687; } @@ -1820,7 +1827,8 @@ exports[`EditSettingsView should add field 1`] = ` color: #666687; } -.c13[aria-disabled='true']:active svg > g,.c13[aria-disabled='true']:active svg path { +.c13[aria-disabled='true']:active svg > g, +.c13[aria-disabled='true']:active svg path { fill: #666687; } @@ -1886,7 +1894,8 @@ exports[`EditSettingsView should add field 1`] = ` color: #666687; } -.c56[aria-disabled='true'] svg > g,.c56[aria-disabled='true'] svg path { +.c56[aria-disabled='true'] svg > g, +.c56[aria-disabled='true'] svg path { fill: #666687; } @@ -1899,7 +1908,8 @@ exports[`EditSettingsView should add field 1`] = ` color: #666687; } -.c56[aria-disabled='true']:active svg > g,.c56[aria-disabled='true']:active svg path { +.c56[aria-disabled='true']:active svg > g, +.c56[aria-disabled='true']:active svg path { fill: #666687; } @@ -2149,7 +2159,8 @@ exports[`EditSettingsView should add field 1`] = ` color: #666687; } -.c39[aria-disabled='true'] svg > g,.c39[aria-disabled='true'] svg path { +.c39[aria-disabled='true'] svg > g, +.c39[aria-disabled='true'] svg path { fill: #666687; } @@ -2162,7 +2173,8 @@ exports[`EditSettingsView should add field 1`] = ` color: #666687; } -.c39[aria-disabled='true']:active svg > g,.c39[aria-disabled='true']:active svg path { +.c39[aria-disabled='true']:active svg > g, +.c39[aria-disabled='true']:active svg path { fill: #666687; } diff --git a/packages/core/admin/admin/src/content-manager/pages/EditView/Header/tests/index.test.js b/packages/core/admin/admin/src/content-manager/pages/EditView/Header/tests/index.test.js index ab119728e5..bf9f81278e 100644 --- a/packages/core/admin/admin/src/content-manager/pages/EditView/Header/tests/index.test.js +++ b/packages/core/admin/admin/src/content-manager/pages/EditView/Header/tests/index.test.js @@ -231,7 +231,8 @@ describe('CONTENT MANAGER | EditView | Header', () => { color: #666687; } - .c13[aria-disabled='true'] svg > g,.c13[aria-disabled='true'] svg path { + .c13[aria-disabled='true'] svg > g, + .c13[aria-disabled='true'] svg path { fill: #666687; } @@ -244,7 +245,8 @@ describe('CONTENT MANAGER | EditView | Header', () => { color: #666687; } - .c13[aria-disabled='true']:active svg > g,.c13[aria-disabled='true']:active svg path { + .c13[aria-disabled='true']:active svg > g, + .c13[aria-disabled='true']:active svg path { fill: #666687; } diff --git a/packages/core/admin/admin/src/content-manager/pages/ListSettingsView/tests/__snapshots__/index.test.js.snap b/packages/core/admin/admin/src/content-manager/pages/ListSettingsView/tests/__snapshots__/index.test.js.snap index a2fa9adc80..a217935a99 100644 --- a/packages/core/admin/admin/src/content-manager/pages/ListSettingsView/tests/__snapshots__/index.test.js.snap +++ b/packages/core/admin/admin/src/content-manager/pages/ListSettingsView/tests/__snapshots__/index.test.js.snap @@ -408,7 +408,8 @@ exports[`ADMIN | CM | LV | Configure the view renders and matches the snapshot 1 color: #666687; } -.c16[aria-disabled='true'] svg > g,.c16[aria-disabled='true'] svg path { +.c16[aria-disabled='true'] svg > g, +.c16[aria-disabled='true'] svg path { fill: #666687; } @@ -421,7 +422,8 @@ exports[`ADMIN | CM | LV | Configure the view renders and matches the snapshot 1 color: #666687; } -.c16[aria-disabled='true']:active svg > g,.c16[aria-disabled='true']:active svg path { +.c16[aria-disabled='true']:active svg > g, +.c16[aria-disabled='true']:active svg path { fill: #666687; } @@ -2138,7 +2140,8 @@ exports[`ADMIN | CM | LV | Configure the view should add field 1`] = ` color: #666687; } -.c16[aria-disabled='true'] svg > g,.c16[aria-disabled='true'] svg path { +.c16[aria-disabled='true'] svg > g, +.c16[aria-disabled='true'] svg path { fill: #666687; } @@ -2151,7 +2154,8 @@ exports[`ADMIN | CM | LV | Configure the view should add field 1`] = ` color: #666687; } -.c16[aria-disabled='true']:active svg > g,.c16[aria-disabled='true']:active svg path { +.c16[aria-disabled='true']:active svg > g, +.c16[aria-disabled='true']:active svg path { fill: #666687; } diff --git a/packages/core/admin/admin/src/content-manager/pages/NoContentType/tests/index.test.js b/packages/core/admin/admin/src/content-manager/pages/NoContentType/tests/index.test.js index d49ed88d77..85ba940130 100644 --- a/packages/core/admin/admin/src/content-manager/pages/NoContentType/tests/index.test.js +++ b/packages/core/admin/admin/src/content-manager/pages/NoContentType/tests/index.test.js @@ -231,7 +231,8 @@ describe('CONTENT MANAGER | pages | NoContentType', () => { color: #666687; } - .c15[aria-disabled='true'] svg > g,.c15[aria-disabled='true'] svg path { + .c15[aria-disabled='true'] svg > g, + .c15[aria-disabled='true'] svg path { fill: #666687; } @@ -244,7 +245,8 @@ describe('CONTENT MANAGER | pages | NoContentType', () => { color: #666687; } - .c15[aria-disabled='true']:active svg > g,.c15[aria-disabled='true']:active svg path { + .c15[aria-disabled='true']:active svg > g, + .c15[aria-disabled='true']:active svg path { fill: #666687; } diff --git a/packages/core/admin/admin/src/pages/AuthPage/components/Login/tests/BaseLogin.test.js b/packages/core/admin/admin/src/pages/AuthPage/components/Login/tests/BaseLogin.test.js index 32fdf7904f..91f9703f0c 100644 --- a/packages/core/admin/admin/src/pages/AuthPage/components/Login/tests/BaseLogin.test.js +++ b/packages/core/admin/admin/src/pages/AuthPage/components/Login/tests/BaseLogin.test.js @@ -291,7 +291,8 @@ describe('ADMIN | PAGES | AUTH | BaseLogin', () => { color: #666687; } - .c31[aria-disabled='true'] svg > g,.c31[aria-disabled='true'] svg path { + .c31[aria-disabled='true'] svg > g, + .c31[aria-disabled='true'] svg path { fill: #666687; } @@ -304,7 +305,8 @@ describe('ADMIN | PAGES | AUTH | BaseLogin', () => { color: #666687; } - .c31[aria-disabled='true']:active svg > g,.c31[aria-disabled='true']:active svg path { + .c31[aria-disabled='true']:active svg > g, + .c31[aria-disabled='true']:active svg path { fill: #666687; } diff --git a/packages/core/admin/admin/src/pages/AuthPage/components/Oops/tests/index.test.js b/packages/core/admin/admin/src/pages/AuthPage/components/Oops/tests/index.test.js index a1cf1f6724..47db1dece2 100644 --- a/packages/core/admin/admin/src/pages/AuthPage/components/Oops/tests/index.test.js +++ b/packages/core/admin/admin/src/pages/AuthPage/components/Oops/tests/index.test.js @@ -238,7 +238,8 @@ describe('ADMIN | PAGES | AUTH | Oops', () => { color: #666687; } - .c4[aria-disabled='true'] svg > g,.c4[aria-disabled='true'] svg path { + .c4[aria-disabled='true'] svg > g, + .c4[aria-disabled='true'] svg path { fill: #666687; } @@ -251,7 +252,8 @@ describe('ADMIN | PAGES | AUTH | Oops', () => { color: #666687; } - .c4[aria-disabled='true']:active svg > g,.c4[aria-disabled='true']:active svg path { + .c4[aria-disabled='true']:active svg > g, + .c4[aria-disabled='true']:active svg path { fill: #666687; } diff --git a/packages/core/admin/admin/src/pages/AuthPage/components/Register/tests/index.test.js b/packages/core/admin/admin/src/pages/AuthPage/components/Register/tests/index.test.js index f13923c269..84e27030ae 100644 --- a/packages/core/admin/admin/src/pages/AuthPage/components/Register/tests/index.test.js +++ b/packages/core/admin/admin/src/pages/AuthPage/components/Register/tests/index.test.js @@ -316,7 +316,8 @@ describe('ADMIN | PAGES | AUTH | Register', () => { color: #666687; } - .c4[aria-disabled='true'] svg > g,.c4[aria-disabled='true'] svg path { + .c4[aria-disabled='true'] svg > g, + .c4[aria-disabled='true'] svg path { fill: #666687; } @@ -329,7 +330,8 @@ describe('ADMIN | PAGES | AUTH | Register', () => { color: #666687; } - .c4[aria-disabled='true']:active svg > g,.c4[aria-disabled='true']:active svg path { + .c4[aria-disabled='true']:active svg > g, + .c4[aria-disabled='true']:active svg path { fill: #666687; } @@ -396,7 +398,8 @@ describe('ADMIN | PAGES | AUTH | Register', () => { color: #666687; } - .c42[aria-disabled='true'] svg > g,.c42[aria-disabled='true'] svg path { + .c42[aria-disabled='true'] svg > g, + .c42[aria-disabled='true'] svg path { fill: #666687; } @@ -409,7 +412,8 @@ describe('ADMIN | PAGES | AUTH | Register', () => { color: #666687; } - .c42[aria-disabled='true']:active svg > g,.c42[aria-disabled='true']:active svg path { + .c42[aria-disabled='true']:active svg > g, + .c42[aria-disabled='true']:active svg path { fill: #666687; } diff --git a/packages/core/admin/admin/src/pages/AuthPage/components/ResetPassword/tests/index.test.js b/packages/core/admin/admin/src/pages/AuthPage/components/ResetPassword/tests/index.test.js index 9bf02b0344..1490294738 100644 --- a/packages/core/admin/admin/src/pages/AuthPage/components/ResetPassword/tests/index.test.js +++ b/packages/core/admin/admin/src/pages/AuthPage/components/ResetPassword/tests/index.test.js @@ -311,7 +311,8 @@ describe('ADMIN | PAGES | AUTH | ResetPassword', () => { color: #666687; } - .c4[aria-disabled='true'] svg > g,.c4[aria-disabled='true'] svg path { + .c4[aria-disabled='true'] svg > g, + .c4[aria-disabled='true'] svg path { fill: #666687; } @@ -324,7 +325,8 @@ describe('ADMIN | PAGES | AUTH | ResetPassword', () => { color: #666687; } - .c4[aria-disabled='true']:active svg > g,.c4[aria-disabled='true']:active svg path { + .c4[aria-disabled='true']:active svg > g, + .c4[aria-disabled='true']:active svg path { fill: #666687; } @@ -382,7 +384,8 @@ describe('ADMIN | PAGES | AUTH | ResetPassword', () => { color: #666687; } - .c32[aria-disabled='true'] svg > g,.c32[aria-disabled='true'] svg path { + .c32[aria-disabled='true'] svg > g, + .c32[aria-disabled='true'] svg path { fill: #666687; } @@ -395,7 +398,8 @@ describe('ADMIN | PAGES | AUTH | ResetPassword', () => { color: #666687; } - .c32[aria-disabled='true']:active svg > g,.c32[aria-disabled='true']:active svg path { + .c32[aria-disabled='true']:active svg > g, + .c32[aria-disabled='true']:active svg path { fill: #666687; } diff --git a/packages/core/admin/admin/src/pages/HomePage/tests/index.test.js b/packages/core/admin/admin/src/pages/HomePage/tests/index.test.js index 35c578b1ae..53d7236268 100644 --- a/packages/core/admin/admin/src/pages/HomePage/tests/index.test.js +++ b/packages/core/admin/admin/src/pages/HomePage/tests/index.test.js @@ -327,7 +327,8 @@ describe('Homepage', () => { color: #666687; } - .c18[aria-disabled='true'] svg > g,.c18[aria-disabled='true'] svg path { + .c18[aria-disabled='true'] svg > g, + .c18[aria-disabled='true'] svg path { fill: #666687; } @@ -340,7 +341,8 @@ describe('Homepage', () => { color: #666687; } - .c18[aria-disabled='true']:active svg > g,.c18[aria-disabled='true']:active svg path { + .c18[aria-disabled='true']:active svg > g, + .c18[aria-disabled='true']:active svg path { fill: #666687; } @@ -462,7 +464,8 @@ describe('Homepage', () => { color: #666687; } - .c45[aria-disabled='true'] svg > g,.c45[aria-disabled='true'] svg path { + .c45[aria-disabled='true'] svg > g, + .c45[aria-disabled='true'] svg path { fill: #666687; } @@ -475,7 +478,8 @@ describe('Homepage', () => { color: #666687; } - .c45[aria-disabled='true']:active svg > g,.c45[aria-disabled='true']:active svg path { + .c45[aria-disabled='true']:active svg > g, + .c45[aria-disabled='true']:active svg path { fill: #666687; } diff --git a/packages/core/admin/admin/src/pages/InternalErrorPage/tests/index.test.js b/packages/core/admin/admin/src/pages/InternalErrorPage/tests/index.test.js index 05e9db8e75..1da22a4e31 100644 --- a/packages/core/admin/admin/src/pages/InternalErrorPage/tests/index.test.js +++ b/packages/core/admin/admin/src/pages/InternalErrorPage/tests/index.test.js @@ -226,7 +226,8 @@ describe('InternalErrorPage', () => { color: #666687; } - .c15[aria-disabled='true'] svg > g,.c15[aria-disabled='true'] svg path { + .c15[aria-disabled='true'] svg > g, + .c15[aria-disabled='true'] svg path { fill: #666687; } @@ -239,7 +240,8 @@ describe('InternalErrorPage', () => { color: #666687; } - .c15[aria-disabled='true']:active svg > g,.c15[aria-disabled='true']:active svg path { + .c15[aria-disabled='true']:active svg > g, + .c15[aria-disabled='true']:active svg path { fill: #666687; } diff --git a/packages/core/admin/admin/src/pages/MarketplacePage/tests/__snapshots__/index.test.js.snap b/packages/core/admin/admin/src/pages/MarketplacePage/tests/__snapshots__/index.test.js.snap index d81dd330e6..8811ab462b 100644 --- a/packages/core/admin/admin/src/pages/MarketplacePage/tests/__snapshots__/index.test.js.snap +++ b/packages/core/admin/admin/src/pages/MarketplacePage/tests/__snapshots__/index.test.js.snap @@ -464,7 +464,8 @@ exports[`Marketplace page - layout renders the online layout 1`] = ` color: #666687; } -.c46[aria-disabled='true'] svg > g,.c46[aria-disabled='true'] svg path { +.c46[aria-disabled='true'] svg > g, +.c46[aria-disabled='true'] svg path { fill: #666687; } @@ -477,7 +478,8 @@ exports[`Marketplace page - layout renders the online layout 1`] = ` color: #666687; } -.c46[aria-disabled='true']:active svg > g,.c46[aria-disabled='true']:active svg path { +.c46[aria-disabled='true']:active svg > g, +.c46[aria-disabled='true']:active svg path { fill: #666687; } @@ -536,7 +538,8 @@ exports[`Marketplace page - layout renders the online layout 1`] = ` color: #666687; } -.c73[aria-disabled='true'] svg > g,.c73[aria-disabled='true'] svg path { +.c73[aria-disabled='true'] svg > g, +.c73[aria-disabled='true'] svg path { fill: #666687; } @@ -549,7 +552,8 @@ exports[`Marketplace page - layout renders the online layout 1`] = ` color: #666687; } -.c73[aria-disabled='true']:active svg > g,.c73[aria-disabled='true']:active svg path { +.c73[aria-disabled='true']:active svg > g, +.c73[aria-disabled='true']:active svg path { fill: #666687; } @@ -806,7 +810,8 @@ exports[`Marketplace page - layout renders the online layout 1`] = ` color: #666687; } -.c12[aria-disabled='true'] svg > g,.c12[aria-disabled='true'] svg path { +.c12[aria-disabled='true'] svg > g, +.c12[aria-disabled='true'] svg path { fill: #666687; } @@ -819,7 +824,8 @@ exports[`Marketplace page - layout renders the online layout 1`] = ` color: #666687; } -.c12[aria-disabled='true']:active svg > g,.c12[aria-disabled='true']:active svg path { +.c12[aria-disabled='true']:active svg > g, +.c12[aria-disabled='true']:active svg path { fill: #666687; } diff --git a/packages/core/admin/admin/src/pages/MarketplacePage/tests/__snapshots__/plugins.test.js.snap b/packages/core/admin/admin/src/pages/MarketplacePage/tests/__snapshots__/plugins.test.js.snap index 38366ecf56..a8678861d5 100644 --- a/packages/core/admin/admin/src/pages/MarketplacePage/tests/__snapshots__/plugins.test.js.snap +++ b/packages/core/admin/admin/src/pages/MarketplacePage/tests/__snapshots__/plugins.test.js.snap @@ -464,7 +464,8 @@ exports[`Marketplace page - plugins tab renders and matches the plugin tab snaps color: #666687; } -.c46[aria-disabled='true'] svg > g,.c46[aria-disabled='true'] svg path { +.c46[aria-disabled='true'] svg > g, +.c46[aria-disabled='true'] svg path { fill: #666687; } @@ -477,7 +478,8 @@ exports[`Marketplace page - plugins tab renders and matches the plugin tab snaps color: #666687; } -.c46[aria-disabled='true']:active svg > g,.c46[aria-disabled='true']:active svg path { +.c46[aria-disabled='true']:active svg > g, +.c46[aria-disabled='true']:active svg path { fill: #666687; } @@ -536,7 +538,8 @@ exports[`Marketplace page - plugins tab renders and matches the plugin tab snaps color: #666687; } -.c73[aria-disabled='true'] svg > g,.c73[aria-disabled='true'] svg path { +.c73[aria-disabled='true'] svg > g, +.c73[aria-disabled='true'] svg path { fill: #666687; } @@ -549,7 +552,8 @@ exports[`Marketplace page - plugins tab renders and matches the plugin tab snaps color: #666687; } -.c73[aria-disabled='true']:active svg > g,.c73[aria-disabled='true']:active svg path { +.c73[aria-disabled='true']:active svg > g, +.c73[aria-disabled='true']:active svg path { fill: #666687; } @@ -806,7 +810,8 @@ exports[`Marketplace page - plugins tab renders and matches the plugin tab snaps color: #666687; } -.c12[aria-disabled='true'] svg > g,.c12[aria-disabled='true'] svg path { +.c12[aria-disabled='true'] svg > g, +.c12[aria-disabled='true'] svg path { fill: #666687; } @@ -819,7 +824,8 @@ exports[`Marketplace page - plugins tab renders and matches the plugin tab snaps color: #666687; } -.c12[aria-disabled='true']:active svg > g,.c12[aria-disabled='true']:active svg path { +.c12[aria-disabled='true']:active svg > g, +.c12[aria-disabled='true']:active svg path { fill: #666687; } diff --git a/packages/core/admin/admin/src/pages/MarketplacePage/tests/__snapshots__/providers.test.js.snap b/packages/core/admin/admin/src/pages/MarketplacePage/tests/__snapshots__/providers.test.js.snap index 1413968348..8ee81b3003 100644 --- a/packages/core/admin/admin/src/pages/MarketplacePage/tests/__snapshots__/providers.test.js.snap +++ b/packages/core/admin/admin/src/pages/MarketplacePage/tests/__snapshots__/providers.test.js.snap @@ -459,7 +459,8 @@ exports[`Marketplace page - providers tab renders and matches the providers tab color: #666687; } -.c46[aria-disabled='true'] svg > g,.c46[aria-disabled='true'] svg path { +.c46[aria-disabled='true'] svg > g, +.c46[aria-disabled='true'] svg path { fill: #666687; } @@ -472,7 +473,8 @@ exports[`Marketplace page - providers tab renders and matches the providers tab color: #666687; } -.c46[aria-disabled='true']:active svg > g,.c46[aria-disabled='true']:active svg path { +.c46[aria-disabled='true']:active svg > g, +.c46[aria-disabled='true']:active svg path { fill: #666687; } @@ -531,7 +533,8 @@ exports[`Marketplace page - providers tab renders and matches the providers tab color: #666687; } -.c69[aria-disabled='true'] svg > g,.c69[aria-disabled='true'] svg path { +.c69[aria-disabled='true'] svg > g, +.c69[aria-disabled='true'] svg path { fill: #666687; } @@ -544,7 +547,8 @@ exports[`Marketplace page - providers tab renders and matches the providers tab color: #666687; } -.c69[aria-disabled='true']:active svg > g,.c69[aria-disabled='true']:active svg path { +.c69[aria-disabled='true']:active svg > g, +.c69[aria-disabled='true']:active svg path { fill: #666687; } @@ -801,7 +805,8 @@ exports[`Marketplace page - providers tab renders and matches the providers tab color: #666687; } -.c12[aria-disabled='true'] svg > g,.c12[aria-disabled='true'] svg path { +.c12[aria-disabled='true'] svg > g, +.c12[aria-disabled='true'] svg path { fill: #666687; } @@ -814,7 +819,8 @@ exports[`Marketplace page - providers tab renders and matches the providers tab color: #666687; } -.c12[aria-disabled='true']:active svg > g,.c12[aria-disabled='true']:active svg path { +.c12[aria-disabled='true']:active svg > g, +.c12[aria-disabled='true']:active svg path { fill: #666687; } diff --git a/packages/core/admin/admin/src/pages/NotFoundPage/tests/index.test.js b/packages/core/admin/admin/src/pages/NotFoundPage/tests/index.test.js index 74aac50efe..f90745e2f5 100644 --- a/packages/core/admin/admin/src/pages/NotFoundPage/tests/index.test.js +++ b/packages/core/admin/admin/src/pages/NotFoundPage/tests/index.test.js @@ -226,7 +226,8 @@ describe('NotFoundPage', () => { color: #666687; } - .c15[aria-disabled='true'] svg > g,.c15[aria-disabled='true'] svg path { + .c15[aria-disabled='true'] svg > g, + .c15[aria-disabled='true'] svg path { fill: #666687; } @@ -239,7 +240,8 @@ describe('NotFoundPage', () => { color: #666687; } - .c15[aria-disabled='true']:active svg > g,.c15[aria-disabled='true']:active svg path { + .c15[aria-disabled='true']:active svg > g, + .c15[aria-disabled='true']:active svg path { fill: #666687; } diff --git a/packages/core/admin/admin/src/pages/ProfilePage/tests/__snapshots__/index.test.js.snap b/packages/core/admin/admin/src/pages/ProfilePage/tests/__snapshots__/index.test.js.snap index e3df34e058..ae11fabb09 100644 --- a/packages/core/admin/admin/src/pages/ProfilePage/tests/__snapshots__/index.test.js.snap +++ b/packages/core/admin/admin/src/pages/ProfilePage/tests/__snapshots__/index.test.js.snap @@ -401,7 +401,8 @@ exports[`ADMIN | Pages | Profile page renders and matches the snapshot 1`] = ` color: #666687; } -.c8[aria-disabled='true'] svg > g,.c8[aria-disabled='true'] svg path { +.c8[aria-disabled='true'] svg > g, +.c8[aria-disabled='true'] svg path { fill: #666687; } @@ -414,7 +415,8 @@ exports[`ADMIN | Pages | Profile page renders and matches the snapshot 1`] = ` color: #666687; } -.c8[aria-disabled='true']:active svg > g,.c8[aria-disabled='true']:active svg path { +.c8[aria-disabled='true']:active svg > g, +.c8[aria-disabled='true']:active svg path { fill: #666687; } diff --git a/packages/core/admin/admin/src/pages/SettingsPage/pages/ApiTokens/EditView/tests/__snapshots__/index.test.js.snap b/packages/core/admin/admin/src/pages/SettingsPage/pages/ApiTokens/EditView/tests/__snapshots__/index.test.js.snap index d9dc433149..adaa8d3035 100644 --- a/packages/core/admin/admin/src/pages/SettingsPage/pages/ApiTokens/EditView/tests/__snapshots__/index.test.js.snap +++ b/packages/core/admin/admin/src/pages/SettingsPage/pages/ApiTokens/EditView/tests/__snapshots__/index.test.js.snap @@ -429,7 +429,8 @@ exports[`ADMIN | Pages | API TOKENS | EditView renders and matches the snapshot color: #666687; } -.c15[aria-disabled='true'] svg > g,.c15[aria-disabled='true'] svg path { +.c15[aria-disabled='true'] svg > g, +.c15[aria-disabled='true'] svg path { fill: #666687; } @@ -442,7 +443,8 @@ exports[`ADMIN | Pages | API TOKENS | EditView renders and matches the snapshot color: #666687; } -.c15[aria-disabled='true']:active svg > g,.c15[aria-disabled='true']:active svg path { +.c15[aria-disabled='true']:active svg > g, +.c15[aria-disabled='true']:active svg path { fill: #666687; } @@ -795,6 +797,10 @@ exports[`ADMIN | Pages | API TOKENS | EditView renders and matches the snapshot border: 1px solid #4945ff; } +.c52:hover:not([aria-disabled='true']) .sc-cqJhZP { + color: #271fe0; +} + .c52:hover:not([aria-disabled='true']) .c7 { color: #4945ff; } @@ -815,6 +821,10 @@ exports[`ADMIN | Pages | API TOKENS | EditView renders and matches the snapshot border: 1px solid #4945ff; } +.c66:hover:not([aria-disabled='true']) .sc-cqJhZP { + color: #271fe0; +} + .c66:hover:not([aria-disabled='true']) .c7 { color: #4945ff; } @@ -1390,7 +1400,7 @@ exports[`ADMIN | Pages | API TOKENS | EditView renders and matches the snapshot class="c7 c60" > Address @@ -1455,7 +1465,7 @@ exports[`ADMIN | Pages | API TOKENS | EditView renders and matches the snapshot class="c7 c60" > Category @@ -2035,7 +2045,8 @@ exports[`ADMIN | Pages | API TOKENS | EditView renders and matches the snapshot color: #666687; } -.c15[aria-disabled='true'] svg > g,.c15[aria-disabled='true'] svg path { +.c15[aria-disabled='true'] svg > g, +.c15[aria-disabled='true'] svg path { fill: #666687; } @@ -2048,7 +2059,8 @@ exports[`ADMIN | Pages | API TOKENS | EditView renders and matches the snapshot color: #666687; } -.c15[aria-disabled='true']:active svg > g,.c15[aria-disabled='true']:active svg path { +.c15[aria-disabled='true']:active svg > g, +.c15[aria-disabled='true']:active svg path { fill: #666687; } @@ -2105,7 +2117,8 @@ exports[`ADMIN | Pages | API TOKENS | EditView renders and matches the snapshot color: #666687; } -.c18[aria-disabled='true'] svg > g,.c18[aria-disabled='true'] svg path { +.c18[aria-disabled='true'] svg > g, +.c18[aria-disabled='true'] svg path { fill: #666687; } @@ -2118,7 +2131,8 @@ exports[`ADMIN | Pages | API TOKENS | EditView renders and matches the snapshot color: #666687; } -.c18[aria-disabled='true']:active svg > g,.c18[aria-disabled='true']:active svg path { +.c18[aria-disabled='true']:active svg > g, +.c18[aria-disabled='true']:active svg path { fill: #666687; } @@ -2521,6 +2535,10 @@ exports[`ADMIN | Pages | API TOKENS | EditView renders and matches the snapshot border: 1px solid #4945ff; } +.c61:hover:not([aria-disabled='true']) .sc-cqJhZP { + color: #271fe0; +} + .c61:hover:not([aria-disabled='true']) .c7 { color: #4945ff; } @@ -2541,6 +2559,10 @@ exports[`ADMIN | Pages | API TOKENS | EditView renders and matches the snapshot border: 1px solid #4945ff; } +.c75:hover:not([aria-disabled='true']) .sc-cqJhZP { + color: #271fe0; +} + .c75:hover:not([aria-disabled='true']) .c7 { color: #4945ff; } @@ -3192,7 +3214,7 @@ exports[`ADMIN | Pages | API TOKENS | EditView renders and matches the snapshot class="c7 c69" > Address @@ -3257,7 +3279,7 @@ exports[`ADMIN | Pages | API TOKENS | EditView renders and matches the snapshot class="c7 c69" > Category diff --git a/packages/core/admin/admin/src/pages/SettingsPage/pages/ApiTokens/ListView/tests/index.test.js b/packages/core/admin/admin/src/pages/SettingsPage/pages/ApiTokens/ListView/tests/index.test.js index 5ea88de2ff..62e0abcd31 100644 --- a/packages/core/admin/admin/src/pages/SettingsPage/pages/ApiTokens/ListView/tests/index.test.js +++ b/packages/core/admin/admin/src/pages/SettingsPage/pages/ApiTokens/ListView/tests/index.test.js @@ -549,7 +549,8 @@ describe('ADMIN | Pages | API TOKENS | ListPage', () => { color: #666687; } - .c8[aria-disabled='true'] svg > g,.c8[aria-disabled='true'] svg path { + .c8[aria-disabled='true'] svg > g, + .c8[aria-disabled='true'] svg path { fill: #666687; } @@ -562,7 +563,8 @@ describe('ADMIN | Pages | API TOKENS | ListPage', () => { color: #666687; } - .c8[aria-disabled='true']:active svg > g,.c8[aria-disabled='true']:active svg path { + .c8[aria-disabled='true']:active svg > g, + .c8[aria-disabled='true']:active svg path { fill: #666687; } diff --git a/packages/core/admin/admin/src/pages/SettingsPage/pages/ApplicationInfosPage/components/LogoInput/tests/__snapshots__/index.test.js.snap b/packages/core/admin/admin/src/pages/SettingsPage/pages/ApplicationInfosPage/components/LogoInput/tests/__snapshots__/index.test.js.snap index b81e976a3b..adec2d74d6 100644 --- a/packages/core/admin/admin/src/pages/SettingsPage/pages/ApplicationInfosPage/components/LogoInput/tests/__snapshots__/index.test.js.snap +++ b/packages/core/admin/admin/src/pages/SettingsPage/pages/ApplicationInfosPage/components/LogoInput/tests/__snapshots__/index.test.js.snap @@ -1,7 +1,10 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP exports[`ApplicationsInfosPage || LogoInput from computer should render upload modal with from computer tab 1`] = ` -.c23 { + + .c23 { border: 0; -webkit-clip: rect(0 0 0 0); clip: rect(0 0 0 0); @@ -53,76 +56,6 @@ exports[`ApplicationsInfosPage || LogoInput from computer should render upload m padding-left: 16px; } -.c24 { - background: #212134; - padding: 8px; - border-radius: 4px; -} - -.c28 { - background: #ffffff; - border-radius: 4px; - box-shadow: 0px 2px 15px rgba(33,33,52,0.1); -} - -.c30 { - background: #f6f6f9; - padding-top: 16px; - padding-right: 20px; - padding-bottom: 16px; - padding-left: 20px; -} - -.c34 { - padding-right: 40px; - padding-left: 40px; -} - -.c36 { - padding: 16px; -} - -.c41 { - background: #eaeaef; -} - -.c43 { - padding-top: 24px; - padding-right: 40px; - padding-bottom: 24px; - padding-left: 40px; -} - -.c45 { - background: #f6f6f9; - padding-top: 48px; - padding-bottom: 32px; - border-radius: 4px; - border-style: dashed; - border-width: 1px; - border-color: #c0c0cf; - position: relative; -} - -.c47 { - color: #4945ff; - width: 3.75rem; - height: 3.75rem; -} - -.c49 { - padding-top: 12px; - padding-bottom: 20px; -} - -.c54 { - padding-top: 24px; -} - -.c48 path { - fill: #4945ff; -} - .c4 { font-size: 0.75rem; line-height: 1.33; @@ -146,51 +79,6 @@ exports[`ApplicationsInfosPage || LogoInput from computer should render upload m color: #666687; } -.c26 { - font-size: 0.75rem; - line-height: 1.33; - font-weight: 600; - color: #ffffff; -} - -.c33 { - font-size: 0.875rem; - line-height: 1.43; - font-weight: 600; - color: #32324d; -} - -.c38 { - font-weight: 600; - font-size: 0.6875rem; - line-height: 1.45; - text-transform: uppercase; - color: #4945ff; -} - -.c40 { - font-weight: 600; - font-size: 0.6875rem; - line-height: 1.45; - text-transform: uppercase; - color: #666687; -} - -.c50 { - font-weight: 500; - font-size: 1rem; - line-height: 1.25; - color: #32324d; -} - -.c53 { - font-size: 0.75rem; - line-height: 1.33; - font-weight: 600; - line-height: 1.14; - color: #32324d; -} - .c1 { -webkit-align-items: stretch; -webkit-box-align: stretch; @@ -237,42 +125,6 @@ exports[`ApplicationsInfosPage || LogoInput from computer should render upload m justify-content: center; } -.c32 { - -webkit-align-items: center; - -webkit-box-align: center; - -ms-flex-align: center; - align-items: center; - display: -webkit-box; - display: -webkit-flex; - display: -ms-flexbox; - display: flex; - -webkit-flex-direction: row; - -ms-flex-direction: row; - flex-direction: row; - -webkit-box-pack: justify; - -webkit-justify-content: space-between; - -ms-flex-pack: justify; - justify-content: space-between; -} - -.c46 { - -webkit-align-items: center; - -webkit-box-align: center; - -ms-flex-align: center; - align-items: center; - display: -webkit-box; - display: -webkit-flex; - display: -ms-flexbox; - display: flex; - -webkit-flex-direction: column; - -ms-flex-direction: column; - flex-direction: column; - -webkit-box-pack: center; - -webkit-justify-content: center; - -ms-flex-pack: center; - justify-content: center; -} - .c19 { border: 0; -webkit-clip: rect(0 0 0 0); @@ -285,12 +137,6 @@ exports[`ApplicationsInfosPage || LogoInput from computer should render upload m width: 1px; } -.c25 { - position: absolute; - z-index: 4; - display: none; -} - .c8 { display: grid; grid-template-columns: auto 1fr auto; @@ -310,15 +156,6 @@ exports[`ApplicationsInfosPage || LogoInput from computer should render upload m margin-top: 4px; } -.c44 > * { - margin-top: 0; - margin-bottom: 0; -} - -.c44 > * + * { - margin-top: 8px; -} - .c16 > * { margin-left: 0; margin-right: 0; @@ -433,75 +270,7 @@ exports[`ApplicationsInfosPage || LogoInput from computer should render upload m fill: #666687; } -.c27 { - position: fixed; - z-index: 4; - inset: 0; - background: #32324d1F; - padding: 0 40px; - display: -webkit-box; - display: -webkit-flex; - display: -ms-flexbox; - display: flex; - -webkit-align-items: center; - -webkit-box-align: center; - -ms-flex-align: center; - align-items: center; - -webkit-box-pack: center; - -webkit-justify-content: center; - -ms-flex-pack: center; - justify-content: center; -} - -.c29 { - width: 51.875rem; -} - -.c31 { - border-radius: 4px 4px 0 0; - border-bottom: 1px solid #eaeaef; -} - -.c55 { - border-radius: 0 0 4px 4px; - border-top: 1px solid #eaeaef; -} - -.c56 > * + * { - margin-left: 8px; -} - -.c37 { - border-bottom: 2px solid #4945ff; -} - -.c39 { - border-bottom: 2px solid transparent; -} - -.c35[aria-disabled='true'] { - cursor: not-allowed; -} - -.c42 { - height: 1px; - border: none; - margin: 0; -} - -.c52 { - -webkit-align-items: center; - -webkit-box-align: center; - -ms-flex-align: center; - align-items: center; - background-color: #4945ff; - border: 1px solid #4945ff; - height: 2rem; - padding-left: 16px; - padding-right: 16px; -} - -.c52 .c0 { +.c24 .c0 { display: -webkit-box; display: -webkit-flex; display: -ms-flexbox; @@ -512,66 +281,19 @@ exports[`ApplicationsInfosPage || LogoInput from computer should render upload m align-items: center; } -.c52 .c3 { +.c24 .c3 { color: #ffffff; } -.c52[aria-disabled='true'] { - border: 1px solid #dcdce4; - background: #eaeaef; -} - -.c52[aria-disabled='true'] .c3 { +.c24[aria-disabled='true'] .c3 { color: #666687; } -.c52[aria-disabled='true'] svg > g,.c52[aria-disabled='true'] svg path { - fill: #666687; -} - -.c52[aria-disabled='true']:active { - border: 1px solid #dcdce4; - background: #eaeaef; -} - -.c52[aria-disabled='true']:active .c3 { +.c24[aria-disabled='true']:active .c3 { color: #666687; } -.c52[aria-disabled='true']:active svg > g,.c52[aria-disabled='true']:active svg path { - fill: #666687; -} - -.c52:hover { - border: 1px solid #7b79ff; - background: #7b79ff; -} - -.c52:active { - border: 1px solid #4945ff; - background: #4945ff; -} - -.c52 svg > g, -.c52 svg path { - fill: #ffffff; -} - -.c57 { - -webkit-align-items: center; - -webkit-box-align: center; - -ms-flex-align: center; - align-items: center; - background-color: #4945ff; - border: 1px solid #4945ff; - height: 2rem; - padding-left: 16px; - padding-right: 16px; - border: 1px solid #dcdce4; - background: #ffffff; -} - -.c57 .c0 { +.c25 .c0 { display: -webkit-box; display: -webkit-flex; display: -ms-flexbox; @@ -582,67 +304,23 @@ exports[`ApplicationsInfosPage || LogoInput from computer should render upload m align-items: center; } -.c57 .c3 { +.c25 .c3 { color: #ffffff; } -.c57[aria-disabled='true'] { - border: 1px solid #dcdce4; - background: #eaeaef; -} - -.c57[aria-disabled='true'] .c3 { +.c25[aria-disabled='true'] .c3 { color: #666687; } -.c57[aria-disabled='true'] svg > g,.c57[aria-disabled='true'] svg path { - fill: #666687; -} - -.c57[aria-disabled='true']:active { - border: 1px solid #dcdce4; - background: #eaeaef; -} - -.c57[aria-disabled='true']:active .c3 { +.c25[aria-disabled='true']:active .c3 { color: #666687; } -.c57[aria-disabled='true']:active svg > g,.c57[aria-disabled='true']:active svg path { - fill: #666687; -} - -.c57:hover { - background-color: #f6f6f9; -} - -.c57:active { - background-color: #eaeaef; -} - -.c57 .c3 { +.c25 .c3 { color: #32324d; } -.c57 svg > g, -.c57 svg path { - fill: #32324d; -} - -.c51 { - opacity: 0; - position: absolute; - top: 0; - bottom: 0; - left: 0; - right: 0; - z-index: 1; -} - - -
+
-
-
-
* { + margin-top: 0; + margin-bottom: 0; +} + +.c23 > * + * { + margin-top: 8px; +} + +.c9 { + display: -webkit-box; + display: -webkit-flex; + display: -ms-flexbox; + display: flex; + cursor: pointer; + padding: 8px; + border-radius: 4px; + background: #ffffff; + border: 1px solid #dcdce4; + position: relative; + outline: none; +} + +.c9 svg { + height: 12px; + width: 12px; +} + +.c9 svg > g, +.c9 svg path { + fill: #ffffff; +} + +.c9[aria-disabled='true'] { + pointer-events: none; +} + +.c9:after { + -webkit-transition-property: all; + transition-property: all; + -webkit-transition-duration: 0.2s; + transition-duration: 0.2s; + border-radius: 8px; + content: ''; + position: absolute; + top: -4px; + bottom: -4px; + left: -4px; + right: -4px; + border: 2px solid transparent; +} + +.c9:focus-visible { + outline: none; +} + +.c9:focus-visible:after { + border-radius: 8px; + content: ''; + position: absolute; + top: -5px; + bottom: -5px; + left: -5px; + right: -5px; + border: 2px solid #4945ff; +} + +.c10 { + display: -webkit-box; + display: -webkit-flex; + display: -ms-flexbox; + display: flex; + -webkit-align-items: center; + -webkit-box-align: center; + -ms-flex-align: center; + align-items: center; + -webkit-box-pack: center; + -webkit-justify-content: center; + -ms-flex-pack: center; + justify-content: center; + height: 2rem; + width: 2rem; +} + +.c10 svg > g, +.c10 svg path { + fill: #8e8ea9; +} + +.c10:hover svg > g, +.c10:hover svg path { + fill: #666687; +} + +.c10:active svg > g, +.c10:active svg path { + fill: #a5a5ba; +} + +.c10[aria-disabled='true'] { + background-color: #eaeaef; +} + +.c10[aria-disabled='true'] svg path { + fill: #666687; +} + +.c0 { + position: fixed; + z-index: 4; + inset: 0; + background: #32324d1F; + padding: 0 40px; + display: -webkit-box; + display: -webkit-flex; + display: -ms-flexbox; + display: flex; + -webkit-align-items: center; + -webkit-box-align: center; + -ms-flex-align: center; + align-items: center; + -webkit-box-pack: center; + -webkit-justify-content: center; + -ms-flex-pack: center; + justify-content: center; +} + +.c3 { + width: 51.875rem; +} + +.c5 { + border-radius: 4px 4px 0 0; + border-bottom: 1px solid #eaeaef; +} + +.c35 { + border-radius: 0 0 4px 4px; + border-top: 1px solid #eaeaef; +} + +.c37 > * + * { + margin-left: 8px; +} + +.c15 { + border-bottom: 2px solid #4945ff; +} + +.c17 { + border-bottom: 2px solid transparent; +} + +.c13[aria-disabled='true'] { + cursor: not-allowed; +} + +.c20 { + height: 1px; + border: none; + margin: 0; +} + +.c31 { + -webkit-align-items: center; + -webkit-box-align: center; + -ms-flex-align: center; + align-items: center; + background-color: #4945ff; + border: 1px solid #4945ff; + height: 2rem; + padding-left: 16px; + padding-right: 16px; +} + +.c31 .c1 { + display: -webkit-box; + display: -webkit-flex; + display: -ms-flexbox; + display: flex; + -webkit-align-items: center; + -webkit-box-align: center; + -ms-flex-align: center; + align-items: center; +} + +.c31 .c7 { + color: #ffffff; +} + +.c31[aria-disabled='true'] { + border: 1px solid #dcdce4; + background: #eaeaef; +} + +.c31[aria-disabled='true'] .c7 { + color: #666687; +} + +.c31[aria-disabled='true'] svg > g, +.c31[aria-disabled='true'] svg path { + fill: #666687; +} + +.c31[aria-disabled='true']:active { + border: 1px solid #dcdce4; + background: #eaeaef; +} + +.c31[aria-disabled='true']:active .c7 { + color: #666687; +} + +.c31[aria-disabled='true']:active svg > g, +.c31[aria-disabled='true']:active svg path { + fill: #666687; +} + +.c31:hover { + border: 1px solid #7b79ff; + background: #7b79ff; +} + +.c31:active { + border: 1px solid #4945ff; + background: #4945ff; +} + +.c31 svg > g, +.c31 svg path { + fill: #ffffff; +} + +.c38 { + -webkit-align-items: center; + -webkit-box-align: center; + -ms-flex-align: center; + align-items: center; + background-color: #4945ff; + border: 1px solid #4945ff; + height: 2rem; + padding-left: 16px; + padding-right: 16px; + border: 1px solid #dcdce4; + background: #ffffff; +} + +.c38 .c1 { + display: -webkit-box; + display: -webkit-flex; + display: -ms-flexbox; + display: flex; + -webkit-align-items: center; + -webkit-box-align: center; + -ms-flex-align: center; + align-items: center; +} + +.c38 .c7 { + color: #ffffff; +} + +.c38[aria-disabled='true'] { + border: 1px solid #dcdce4; + background: #eaeaef; +} + +.c38[aria-disabled='true'] .c7 { + color: #666687; +} + +.c38[aria-disabled='true'] svg > g, +.c38[aria-disabled='true'] svg path { + fill: #666687; +} + +.c38[aria-disabled='true']:active { + border: 1px solid #dcdce4; + background: #eaeaef; +} + +.c38[aria-disabled='true']:active .c7 { + color: #666687; +} + +.c38[aria-disabled='true']:active svg > g, +.c38[aria-disabled='true']:active svg path { + fill: #666687; +} + +.c38:hover { + background-color: #f6f6f9; +} + +.c38:active { + background-color: #eaeaef; +} + +.c38 .c7 { + color: #32324d; +} + +.c38 svg > g, +.c38 svg path { + fill: #32324d; +} + +.c30 { + opacity: 0; + position: absolute; + top: 0; + bottom: 0; + left: 0; + right: 0; + z-index: 1; +} + +