diff --git a/package.json b/package.json index 1d7f5a7743afe..6b2c977d90dca 100644 --- a/package.json +++ b/package.json @@ -93,6 +93,12 @@ "pnpm": { "overrides": { "@automattic/calypso-build>enzyme-adapter-react-16@*": "npm:@wojtekmaj/enzyme-adapter-react-17@0.6.3", + "@storybook/addon-docs>@storybook/builder-webpack4": "npm:@storybook/builder-webpack5", + "@storybook/core-common>webpack@4": ">= 4", + "@storybook/core-server>webpack@4": ">= 4", + "@storybook/core-server>@storybook/builder-webpack4": "npm:@storybook/builder-webpack5", + "@storybook/core-server>@storybook/manager-webpack4": "npm:@storybook/manager-webpack5", + "@storybook/react>webpack@4": ">= 4", "isomorphic-fetch>node-fetch@^1.0.1": "^2.6.1", "jest-environment-jsdom@^24.0.0": "^26.0.1", "react-dev-utils>browserslist@^4": "^4", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index fcfe30a0e1cde..aa30ef46eb5b2 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -2,6 +2,12 @@ lockfileVersion: 5.3 overrides: '@automattic/calypso-build>enzyme-adapter-react-16@*': npm:@wojtekmaj/enzyme-adapter-react-17@0.6.3 + '@storybook/addon-docs>@storybook/builder-webpack4': npm:@storybook/builder-webpack5 + '@storybook/core-common>webpack@4': '>= 4' + '@storybook/core-server>webpack@4': '>= 4' + '@storybook/core-server>@storybook/builder-webpack4': npm:@storybook/builder-webpack5 + '@storybook/core-server>@storybook/manager-webpack4': npm:@storybook/manager-webpack5 + '@storybook/react>webpack@4': '>= 4' isomorphic-fetch>node-fetch@^1.0.1: ^2.6.1 jest-environment-jsdom@^24.0.0: ^26.0.1 react-dev-utils>browserslist@^4: ^4 @@ -3653,7 +3659,7 @@ packages: dependencies: '@octokit/openapi-types': 8.2.1 - /@pmmmwh/react-refresh-webpack-plugin/0.4.3_133f2312fd2dfba9fc3b3697533854a6: + /@pmmmwh/react-refresh-webpack-plugin/0.4.3_93428a4abc256bda8a22168e2c276341: resolution: {integrity: sha512-br5Qwvh8D2OQqSXpd1g/xqXKnK0r+Jz6qVKBbWmpUcrbGOxUrf39V5oZ1876084CGn18uMdR5uvPqBv9UqtBjQ==} engines: {node: '>= 10.x'} peerDependencies: @@ -3686,7 +3692,7 @@ packages: react-refresh: 0.8.3 schema-utils: 2.7.1 source-map: 0.7.3 - webpack: 4.46.0 + webpack: 5.51.1 dev: true /@popperjs/core/2.9.2: @@ -3963,7 +3969,7 @@ packages: '@mdx-js/react': 1.6.22_react@17.0.2 '@storybook/addons': 6.3.7_react@17.0.2 '@storybook/api': 6.3.7_react@17.0.2 - '@storybook/builder-webpack4': 6.3.7_react@17.0.2 + '@storybook/builder-webpack4': /@storybook/builder-webpack5/6.3.7_react@17.0.2 '@storybook/client-api': 6.3.7_react@17.0.2 '@storybook/client-logger': 6.3.7 '@storybook/components': 6.3.7_react@17.0.2 @@ -4005,7 +4011,6 @@ packages: - supports-color - typescript - webpack-cli - - webpack-command dev: true /@storybook/addon-knobs/6.2.9_react@17.0.2: @@ -4194,94 +4199,6 @@ packages: util-deprecate: 1.0.2 dev: true - /@storybook/builder-webpack4/6.3.7_react@17.0.2: - resolution: {integrity: sha512-M5envblMzAUrNqP1+ouKiL8iSIW/90+kBRU2QeWlZoZl1ib+fiFoKk06cgbaC70Bx1lU8nOnI/VBvB5pLhXLaw==} - peerDependencies: - react: ^16.8.0 || ^17.0.0 - react-dom: ^16.8.0 || ^17.0.0 - typescript: '*' - peerDependenciesMeta: - typescript: - optional: true - dependencies: - '@babel/core': 7.15.0 - '@babel/plugin-proposal-class-properties': 7.14.5_@babel+core@7.15.0 - '@babel/plugin-proposal-decorators': 7.14.5_@babel+core@7.15.0 - '@babel/plugin-proposal-export-default-from': 7.14.5_@babel+core@7.15.0 - '@babel/plugin-proposal-nullish-coalescing-operator': 7.14.5_@babel+core@7.15.0 - '@babel/plugin-proposal-object-rest-spread': 7.14.7_@babel+core@7.15.0 - '@babel/plugin-proposal-optional-chaining': 7.14.5_@babel+core@7.15.0 - '@babel/plugin-proposal-private-methods': 7.14.5_@babel+core@7.15.0 - '@babel/plugin-syntax-dynamic-import': 7.8.3_@babel+core@7.15.0 - '@babel/plugin-transform-arrow-functions': 7.14.5_@babel+core@7.15.0 - '@babel/plugin-transform-block-scoping': 7.15.3_@babel+core@7.15.0 - '@babel/plugin-transform-classes': 7.14.9_@babel+core@7.15.0 - '@babel/plugin-transform-destructuring': 7.14.7_@babel+core@7.15.0 - '@babel/plugin-transform-for-of': 7.14.5_@babel+core@7.15.0 - '@babel/plugin-transform-parameters': 7.14.5_@babel+core@7.15.0 - '@babel/plugin-transform-shorthand-properties': 7.14.5_@babel+core@7.15.0 - '@babel/plugin-transform-spread': 7.14.6_@babel+core@7.15.0 - '@babel/plugin-transform-template-literals': 7.14.5_@babel+core@7.15.0 - '@babel/preset-env': 7.15.0_@babel+core@7.15.0 - '@babel/preset-react': 7.14.5_@babel+core@7.15.0 - '@babel/preset-typescript': 7.15.0_@babel+core@7.15.0 - '@storybook/addons': 6.3.7_react@17.0.2 - '@storybook/api': 6.3.7_react@17.0.2 - '@storybook/channel-postmessage': 6.3.7 - '@storybook/channels': 6.3.7 - '@storybook/client-api': 6.3.7_react@17.0.2 - '@storybook/client-logger': 6.3.7 - '@storybook/components': 6.3.7_react@17.0.2 - '@storybook/core-common': 6.3.7_react@17.0.2 - '@storybook/core-events': 6.3.7 - '@storybook/node-logger': 6.3.7 - '@storybook/router': 6.3.7_react@17.0.2 - '@storybook/semver': 7.3.2 - '@storybook/theming': 6.3.7_react@17.0.2 - '@storybook/ui': 6.3.7_react@17.0.2 - '@types/node': 14.17.9 - '@types/webpack': 4.41.30 - autoprefixer: 9.8.6 - babel-loader: 8.2.2_be352a5a80662835a7707f972edfcfde - babel-plugin-macros: 2.8.0 - babel-plugin-polyfill-corejs3: 0.1.7_@babel+core@7.15.0 - case-sensitive-paths-webpack-plugin: 2.4.0 - core-js: 3.16.1 - css-loader: 3.6.0_webpack@4.46.0 - dotenv-webpack: 1.8.0_webpack@4.46.0 - file-loader: 6.2.0_webpack@4.46.0 - find-up: 5.0.0 - fork-ts-checker-webpack-plugin: 4.1.6 - fs-extra: 9.1.0 - glob: 7.1.6 - glob-promise: 3.4.0_glob@7.1.6 - global: 4.4.0 - html-webpack-plugin: 4.5.2_webpack@4.46.0 - pnp-webpack-plugin: 1.6.4 - postcss: 7.0.36 - postcss-flexbugs-fixes: 4.2.1 - postcss-loader: 4.3.0_postcss@7.0.36+webpack@4.46.0 - raw-loader: 4.0.2_webpack@4.46.0 - react: 17.0.2 - react-dev-utils: 11.0.4 - stable: 0.1.8 - style-loader: 1.3.0_webpack@4.46.0 - terser-webpack-plugin: 4.2.3_webpack@4.46.0 - ts-dedent: 2.2.0 - url-loader: 4.1.1_file-loader@6.2.0+webpack@4.46.0 - util-deprecate: 1.0.2 - webpack: 4.46.0 - webpack-dev-middleware: 3.7.3_webpack@4.46.0 - webpack-filter-warnings-plugin: 1.2.1_webpack@4.46.0 - webpack-hot-middleware: 2.25.0 - webpack-virtual-modules: 0.2.2 - transitivePeerDependencies: - - '@types/react' - - supports-color - - webpack-cli - - webpack-command - dev: true - /@storybook/builder-webpack5/6.3.7_react@17.0.2: resolution: {integrity: sha512-nenxN9uLnZs4mLjK5RsaduVau8Sb6EO74Sly2xpfTxridRtt3Viw81J1HWr/4vj/FgnN/UONQ9kgstIE6s5MIw==} peerDependencies: @@ -4353,7 +4270,6 @@ packages: - '@types/react' - supports-color - webpack-cli - - webpack-command dev: true /@storybook/channel-postmessage/6.2.9: @@ -4534,40 +4450,6 @@ packages: - '@types/react' dev: true - /@storybook/core-client/6.3.7_react@17.0.2+webpack@4.46.0: - resolution: {integrity: sha512-M/4A65yV+Y4lsCQXX4BtQO/i3BcMPrU5FkDG8qJd3dkcx2fUlFvGWqQPkcTZE+MPVvMEGl/AsEZSADzah9+dAg==} - peerDependencies: - react: ^16.8.0 || ^17.0.0 - react-dom: ^16.8.0 || ^17.0.0 - typescript: '*' - webpack: '*' - peerDependenciesMeta: - typescript: - optional: true - dependencies: - '@storybook/addons': 6.3.7_react@17.0.2 - '@storybook/channel-postmessage': 6.3.7 - '@storybook/client-api': 6.3.7_react@17.0.2 - '@storybook/client-logger': 6.3.7 - '@storybook/core-events': 6.3.7 - '@storybook/csf': 0.0.1 - '@storybook/ui': 6.3.7_react@17.0.2 - airbnb-js-shims: 2.2.1 - ansi-to-html: 0.6.15 - core-js: 3.16.1 - global: 4.4.0 - lodash: 4.17.21 - qs: 6.10.1 - react: 17.0.2 - regenerator-runtime: 0.13.7 - ts-dedent: 2.2.0 - unfetch: 4.2.0 - util-deprecate: 1.0.2 - webpack: 4.46.0 - transitivePeerDependencies: - - '@types/react' - dev: true - /@storybook/core-client/6.3.7_react@17.0.2+webpack@5.51.1: resolution: {integrity: sha512-M/4A65yV+Y4lsCQXX4BtQO/i3BcMPrU5FkDG8qJd3dkcx2fUlFvGWqQPkcTZE+MPVvMEGl/AsEZSADzah9+dAg==} peerDependencies: @@ -4639,7 +4521,7 @@ packages: '@types/micromatch': 4.0.2 '@types/node': 14.17.9 '@types/pretty-hrtime': 1.0.1 - babel-loader: 8.2.2_be352a5a80662835a7707f972edfcfde + babel-loader: 8.2.2_080b9887a086cbf3e61f158e7c92b566 babel-plugin-macros: 3.1.0 babel-plugin-polyfill-corejs3: 0.1.7_@babel+core@7.15.0 chalk: 4.1.2 @@ -4660,11 +4542,10 @@ packages: resolve-from: 5.0.0 ts-dedent: 2.2.0 util-deprecate: 1.0.2 - webpack: 4.46.0 + webpack: 5.51.1 transitivePeerDependencies: - supports-color - webpack-cli - - webpack-command dev: true /@storybook/core-events/6.2.9: @@ -4695,12 +4576,12 @@ packages: typescript: optional: true dependencies: - '@storybook/builder-webpack4': 6.3.7_react@17.0.2 + '@storybook/builder-webpack4': /@storybook/builder-webpack5/6.3.7_react@17.0.2 '@storybook/builder-webpack5': 6.3.7_react@17.0.2 - '@storybook/core-client': 6.3.7_react@17.0.2+webpack@4.46.0 + '@storybook/core-client': 6.3.7_react@17.0.2+webpack@5.51.1 '@storybook/core-common': 6.3.7_react@17.0.2 '@storybook/csf-tools': 6.3.7_@babel+core@7.15.0 - '@storybook/manager-webpack4': 6.3.7_react@17.0.2 + '@storybook/manager-webpack4': /@storybook/manager-webpack5/6.3.7_react@17.0.2 '@storybook/manager-webpack5': 6.3.7_react@17.0.2 '@storybook/node-logger': 6.3.7 '@storybook/semver': 7.3.2 @@ -4730,13 +4611,12 @@ packages: serve-favicon: 2.5.0 ts-dedent: 2.2.0 util-deprecate: 1.0.2 - webpack: 4.46.0 + webpack: 5.51.1 transitivePeerDependencies: - '@babel/core' - '@types/react' - supports-color - webpack-cli - - webpack-command dev: true /@storybook/core/6.3.7_07ac9c655ed275065a80ae2ff9390817: @@ -4763,34 +4643,6 @@ packages: - supports-color - webpack - webpack-cli - - webpack-command - dev: true - - /@storybook/core/6.3.7_cc8fbff19ac98df5de4d654b278f0dd3: - resolution: {integrity: sha512-YTVLPXqgyBg7TALNxQ+cd+GtCm/NFjxr/qQ1mss1T9GCMR0IjE0d0trgOVHHLAO8jCVlK8DeuqZCCgZFTXulRw==} - peerDependencies: - '@storybook/builder-webpack5': 6.3.7 - react: ^16.8.0 || ^17.0.0 - react-dom: ^16.8.0 || ^17.0.0 - typescript: '*' - peerDependenciesMeta: - '@storybook/builder-webpack5': - optional: true - typescript: - optional: true - dependencies: - '@storybook/builder-webpack5': 6.3.7_react@17.0.2 - '@storybook/core-client': 6.3.7_react@17.0.2+webpack@4.46.0 - '@storybook/core-server': 6.3.7_d41e348b62fc0dc8ac4c4e69c759602d - react: 17.0.2 - transitivePeerDependencies: - - '@babel/core' - - '@storybook/manager-webpack5' - - '@types/react' - - supports-color - - webpack - - webpack-cli - - webpack-command dev: true /@storybook/csf-tools/6.3.7_@babel+core@7.15.0: @@ -4821,61 +4673,6 @@ packages: lodash: 4.17.21 dev: true - /@storybook/manager-webpack4/6.3.7_react@17.0.2: - resolution: {integrity: sha512-cwUdO3oklEtx6y+ZOl2zHvflICK85emiXBQGgRcCsnwWQRBZOMh+tCgOSZj4jmISVpT52RtT9woG4jKe15KBig==} - peerDependencies: - react: ^16.8.0 || ^17.0.0 - react-dom: ^16.8.0 || ^17.0.0 - typescript: '*' - peerDependenciesMeta: - typescript: - optional: true - dependencies: - '@babel/core': 7.15.0 - '@babel/plugin-transform-template-literals': 7.14.5_@babel+core@7.15.0 - '@babel/preset-react': 7.14.5_@babel+core@7.15.0 - '@storybook/addons': 6.3.7_react@17.0.2 - '@storybook/core-client': 6.3.7_react@17.0.2+webpack@4.46.0 - '@storybook/core-common': 6.3.7_react@17.0.2 - '@storybook/node-logger': 6.3.7 - '@storybook/theming': 6.3.7_react@17.0.2 - '@storybook/ui': 6.3.7_react@17.0.2 - '@types/node': 14.17.9 - '@types/webpack': 4.41.30 - babel-loader: 8.2.2_be352a5a80662835a7707f972edfcfde - case-sensitive-paths-webpack-plugin: 2.4.0 - chalk: 4.1.2 - core-js: 3.16.1 - css-loader: 3.6.0_webpack@4.46.0 - dotenv-webpack: 1.8.0_webpack@4.46.0 - express: 4.17.1 - file-loader: 6.2.0_webpack@4.46.0 - file-system-cache: 1.0.5 - find-up: 5.0.0 - fs-extra: 9.1.0 - html-webpack-plugin: 4.5.2_webpack@4.46.0 - node-fetch: 2.6.1 - pnp-webpack-plugin: 1.6.4 - react: 17.0.2 - read-pkg-up: 7.0.1 - regenerator-runtime: 0.13.7 - resolve-from: 5.0.0 - style-loader: 1.3.0_webpack@4.46.0 - telejson: 5.3.3 - terser-webpack-plugin: 4.2.3_webpack@4.46.0 - ts-dedent: 2.2.0 - url-loader: 4.1.1_file-loader@6.2.0+webpack@4.46.0 - util-deprecate: 1.0.2 - webpack: 4.46.0 - webpack-dev-middleware: 3.7.3_webpack@4.46.0 - webpack-virtual-modules: 0.2.2 - transitivePeerDependencies: - - '@types/react' - - supports-color - - webpack-cli - - webpack-command - dev: true - /@storybook/manager-webpack5/6.3.7_react@17.0.2: resolution: {integrity: sha512-ikibiIco9X6r2BpAnumJSGEJCwCwPtH4XsDFKRMM/GkrilNR8k6UXv8EB/eSIGjLF5FG3yHs6AX0YcQQ760xfA==} peerDependencies: @@ -4926,7 +4723,6 @@ packages: - '@types/react' - supports-color - webpack-cli - - webpack-command dev: true /@storybook/node-logger/6.3.7: @@ -4945,7 +4741,7 @@ packages: core-js: 3.16.1 dev: true - /@storybook/react-docgen-typescript-plugin/1.0.2-canary.253f8c1.0_webpack@4.46.0: + /@storybook/react-docgen-typescript-plugin/1.0.2-canary.253f8c1.0_webpack@5.51.1: resolution: {integrity: sha512-mmoRG/rNzAiTbh+vGP8d57dfcR2aP+5/Ll03KKFyfy5FqWFm/Gh7u27ikx1I3LmVMI8n6jh5SdWMkMKon7/tDw==} peerDependencies: typescript: '>= 3.x' @@ -4958,7 +4754,7 @@ packages: micromatch: 4.0.4 react-docgen-typescript: 2.1.0 tslib: 2.3.0 - webpack: 4.46.0 + webpack: 5.51.1 transitivePeerDependencies: - supports-color dev: true @@ -4981,12 +4777,12 @@ packages: '@babel/core': 7.15.0 '@babel/preset-flow': 7.14.5_@babel+core@7.15.0 '@babel/preset-react': 7.14.5_@babel+core@7.15.0 - '@pmmmwh/react-refresh-webpack-plugin': 0.4.3_133f2312fd2dfba9fc3b3697533854a6 + '@pmmmwh/react-refresh-webpack-plugin': 0.4.3_93428a4abc256bda8a22168e2c276341 '@storybook/addons': 6.3.7_react@17.0.2 - '@storybook/core': 6.3.7_cc8fbff19ac98df5de4d654b278f0dd3 + '@storybook/core': 6.3.7_07ac9c655ed275065a80ae2ff9390817 '@storybook/core-common': 6.3.7_react@17.0.2 '@storybook/node-logger': 6.3.7 - '@storybook/react-docgen-typescript-plugin': 1.0.2-canary.253f8c1.0_webpack@4.46.0 + '@storybook/react-docgen-typescript-plugin': 1.0.2-canary.253f8c1.0_webpack@5.51.1 '@storybook/semver': 7.3.2 '@types/webpack-env': 1.16.2 babel-plugin-add-react-displayname: 0.0.5 @@ -5002,7 +4798,7 @@ packages: read-pkg-up: 7.0.1 regenerator-runtime: 0.13.7 ts-dedent: 2.2.0 - webpack: 4.46.0 + webpack: 5.51.1 transitivePeerDependencies: - '@storybook/builder-webpack5' - '@storybook/manager-webpack5' @@ -5012,7 +4808,6 @@ packages: - supports-color - type-fest - webpack-cli - - webpack-command - webpack-dev-server - webpack-hot-middleware - webpack-plugin-serve @@ -5883,51 +5678,15 @@ packages: '@webassemblyjs/helper-numbers': 1.11.1 '@webassemblyjs/helper-wasm-bytecode': 1.11.1 - /@webassemblyjs/ast/1.9.0: - resolution: {integrity: sha512-C6wW5L+b7ogSDVqymbkkvuW9kruN//YisMED04xzeBBqjHa2FYnmvOlS6Xj68xWQRgWvI9cIglsjFowH/RJyEA==} - dependencies: - '@webassemblyjs/helper-module-context': 1.9.0 - '@webassemblyjs/helper-wasm-bytecode': 1.9.0 - '@webassemblyjs/wast-parser': 1.9.0 - dev: true - /@webassemblyjs/floating-point-hex-parser/1.11.1: resolution: {integrity: sha512-iGRfyc5Bq+NnNuX8b5hwBrRjzf0ocrJPI6GWFodBFzmFnyvrQ83SHKhmilCU/8Jv67i4GJZBMhEzltxzcNagtQ==} - /@webassemblyjs/floating-point-hex-parser/1.9.0: - resolution: {integrity: sha512-TG5qcFsS8QB4g4MhrxK5TqfdNe7Ey/7YL/xN+36rRjl/BlGE/NcBvJcqsRgCP6Z92mRE+7N50pRIi8SmKUbcQA==} - dev: true - /@webassemblyjs/helper-api-error/1.11.1: resolution: {integrity: sha512-RlhS8CBCXfRUR/cwo2ho9bkheSXG0+NwooXcc3PAILALf2QLdFyj7KGsKRbVc95hZnhnERon4kW/D3SZpp6Tcg==} - /@webassemblyjs/helper-api-error/1.9.0: - resolution: {integrity: sha512-NcMLjoFMXpsASZFxJ5h2HZRcEhDkvnNFOAKneP5RbKRzaWJN36NC4jqQHKwStIhGXu5mUWlUUk7ygdtrO8lbmw==} - dev: true - /@webassemblyjs/helper-buffer/1.11.1: resolution: {integrity: sha512-gwikF65aDNeeXa8JxXa2BAk+REjSyhrNC9ZwdT0f8jc4dQQeDQ7G4m0f2QCLPJiMTTO6wfDmRmj/pW0PsUvIcA==} - /@webassemblyjs/helper-buffer/1.9.0: - resolution: {integrity: sha512-qZol43oqhq6yBPx7YM3m9Bv7WMV9Eevj6kMi6InKOuZxhw+q9hOkvq5e/PpKSiLfyetpaBnogSbNCfBwyB00CA==} - dev: true - - /@webassemblyjs/helper-code-frame/1.9.0: - resolution: {integrity: sha512-ERCYdJBkD9Vu4vtjUYe8LZruWuNIToYq/ME22igL+2vj2dQ2OOujIZr3MEFvfEaqKoVqpsFKAGsRdBSBjrIvZA==} - dependencies: - '@webassemblyjs/wast-printer': 1.9.0 - dev: true - - /@webassemblyjs/helper-fsm/1.9.0: - resolution: {integrity: sha512-OPRowhGbshCb5PxJ8LocpdX9Kl0uB4XsAjl6jH/dWKlk/mzsANvhwbiULsaiqT5GZGT9qinTICdj6PLuM5gslw==} - dev: true - - /@webassemblyjs/helper-module-context/1.9.0: - resolution: {integrity: sha512-MJCW8iGC08tMk2enck1aPW+BE5Cw8/7ph/VGZxwyvGbJwjktKkDK7vy7gAmMDx88D7mhDTCNKAW5tED+gZ0W8g==} - dependencies: - '@webassemblyjs/ast': 1.9.0 - dev: true - /@webassemblyjs/helper-numbers/1.11.1: resolution: {integrity: sha512-vDkbxiB8zfnPdNK9Rajcey5C0w+QJugEglN0of+kmO8l7lDb77AnlKYQF7aarZuCrv+l0UvqL+68gSDr3k9LPQ==} dependencies: @@ -5938,10 +5697,6 @@ packages: /@webassemblyjs/helper-wasm-bytecode/1.11.1: resolution: {integrity: sha512-PvpoOGiJwXeTrSf/qfudJhwlvDQxFgelbMqtq52WWiXC6Xgg1IREdngmPN3bs4RoO83PnL/nFrxucXj1+BX62Q==} - /@webassemblyjs/helper-wasm-bytecode/1.9.0: - resolution: {integrity: sha512-R7FStIzyNcd7xKxCZH5lE0Bqy+hGTwS3LJjuv1ZVxd9O7eHCedSdrId/hMOd20I+v8wDXEn+bjfKDLzTepoaUw==} - dev: true - /@webassemblyjs/helper-wasm-section/1.11.1: resolution: {integrity: sha512-10P9No29rYX1j7F3EVPX3JvGPQPae+AomuSTPiF9eBQeChHI6iqjMIwR9JmOJXwpnn/oVGDk7I5IlskuMwU/pg==} dependencies: @@ -5950,44 +5705,19 @@ packages: '@webassemblyjs/helper-wasm-bytecode': 1.11.1 '@webassemblyjs/wasm-gen': 1.11.1 - /@webassemblyjs/helper-wasm-section/1.9.0: - resolution: {integrity: sha512-XnMB8l3ek4tvrKUUku+IVaXNHz2YsJyOOmz+MMkZvh8h1uSJpSen6vYnw3IoQ7WwEuAhL8Efjms1ZWjqh2agvw==} - dependencies: - '@webassemblyjs/ast': 1.9.0 - '@webassemblyjs/helper-buffer': 1.9.0 - '@webassemblyjs/helper-wasm-bytecode': 1.9.0 - '@webassemblyjs/wasm-gen': 1.9.0 - dev: true - /@webassemblyjs/ieee754/1.11.1: resolution: {integrity: sha512-hJ87QIPtAMKbFq6CGTkZYJivEwZDbQUgYd3qKSadTNOhVY7p+gfP6Sr0lLRVTaG1JjFj+r3YchoqRYxNH3M0GQ==} dependencies: '@xtuc/ieee754': 1.2.0 - /@webassemblyjs/ieee754/1.9.0: - resolution: {integrity: sha512-dcX8JuYU/gvymzIHc9DgxTzUUTLexWwt8uCTWP3otys596io0L5aW02Gb1RjYpx2+0Jus1h4ZFqjla7umFniTg==} - dependencies: - '@xtuc/ieee754': 1.2.0 - dev: true - /@webassemblyjs/leb128/1.11.1: resolution: {integrity: sha512-BJ2P0hNZ0u+Th1YZXJpzW6miwqQUGcIHT1G/sf72gLVD9DZ5AdYTqPNbHZh6K1M5VmKvFXwGSWZADz+qBWxeRw==} dependencies: '@xtuc/long': 4.2.2 - /@webassemblyjs/leb128/1.9.0: - resolution: {integrity: sha512-ENVzM5VwV1ojs9jam6vPys97B/S65YQtv/aanqnU7D8aSoHFX8GyhGg0CMfyKNIHBuAVjy3tlzd5QMMINa7wpw==} - dependencies: - '@xtuc/long': 4.2.2 - dev: true - /@webassemblyjs/utf8/1.11.1: resolution: {integrity: sha512-9kqcxAEdMhiwQkHpkNiorZzqpGrodQQ2IGrHHxCy+Ozng0ofyMA0lTqiLkVs1uzTRejX+/O0EOT7KxqVPuXosQ==} - /@webassemblyjs/utf8/1.9.0: - resolution: {integrity: sha512-GZbQlWtopBTP0u7cHrEx+73yZKrQoBMpwkGEIqlacljhXCkVM1kMQge/Mf+csMJAjEdSwhOyLAS0AoR3AG5P8w==} - dev: true - /@webassemblyjs/wasm-edit/1.11.1: resolution: {integrity: sha512-g+RsupUC1aTHfR8CDgnsVRVZFJqdkFHpsHMfJuWQzWU3tvnLC07UqHICfP+4XyL2tnr1amvl1Sdp06TnYCmVkA==} dependencies: @@ -6000,19 +5730,6 @@ packages: '@webassemblyjs/wasm-parser': 1.11.1 '@webassemblyjs/wast-printer': 1.11.1 - /@webassemblyjs/wasm-edit/1.9.0: - resolution: {integrity: sha512-FgHzBm80uwz5M8WKnMTn6j/sVbqilPdQXTWraSjBwFXSYGirpkSWE2R9Qvz9tNiTKQvoKILpCuTjBKzOIm0nxw==} - dependencies: - '@webassemblyjs/ast': 1.9.0 - '@webassemblyjs/helper-buffer': 1.9.0 - '@webassemblyjs/helper-wasm-bytecode': 1.9.0 - '@webassemblyjs/helper-wasm-section': 1.9.0 - '@webassemblyjs/wasm-gen': 1.9.0 - '@webassemblyjs/wasm-opt': 1.9.0 - '@webassemblyjs/wasm-parser': 1.9.0 - '@webassemblyjs/wast-printer': 1.9.0 - dev: true - /@webassemblyjs/wasm-gen/1.11.1: resolution: {integrity: sha512-F7QqKXwwNlMmsulj6+O7r4mmtAlCWfO/0HdgOxSklZfQcDu0TpLiD1mRt/zF25Bk59FIjEuGAIyn5ei4yMfLhA==} dependencies: @@ -6022,16 +5739,6 @@ packages: '@webassemblyjs/leb128': 1.11.1 '@webassemblyjs/utf8': 1.11.1 - /@webassemblyjs/wasm-gen/1.9.0: - resolution: {integrity: sha512-cPE3o44YzOOHvlsb4+E9qSqjc9Qf9Na1OO/BHFy4OI91XDE14MjFN4lTMezzaIWdPqHnsTodGGNP+iRSYfGkjA==} - dependencies: - '@webassemblyjs/ast': 1.9.0 - '@webassemblyjs/helper-wasm-bytecode': 1.9.0 - '@webassemblyjs/ieee754': 1.9.0 - '@webassemblyjs/leb128': 1.9.0 - '@webassemblyjs/utf8': 1.9.0 - dev: true - /@webassemblyjs/wasm-opt/1.11.1: resolution: {integrity: sha512-VqnkNqnZlU5EB64pp1l7hdm3hmQw7Vgqa0KF/KCNO9sIpI6Fk6brDEiX+iCOYrvMuBWDws0NkTOxYEb85XQHHw==} dependencies: @@ -6040,15 +5747,6 @@ packages: '@webassemblyjs/wasm-gen': 1.11.1 '@webassemblyjs/wasm-parser': 1.11.1 - /@webassemblyjs/wasm-opt/1.9.0: - resolution: {integrity: sha512-Qkjgm6Anhm+OMbIL0iokO7meajkzQD71ioelnfPEj6r4eOFuqm4YC3VBPqXjFyyNwowzbMD+hizmprP/Fwkl2A==} - dependencies: - '@webassemblyjs/ast': 1.9.0 - '@webassemblyjs/helper-buffer': 1.9.0 - '@webassemblyjs/wasm-gen': 1.9.0 - '@webassemblyjs/wasm-parser': 1.9.0 - dev: true - /@webassemblyjs/wasm-parser/1.11.1: resolution: {integrity: sha512-rrBujw+dJu32gYB7/Lup6UhdkPx9S9SnobZzRVL7VcBH9Bt9bCBLEuX/YXOOtBsOZ4NQrRykKhffRWHvigQvOA==} dependencies: @@ -6059,42 +5757,12 @@ packages: '@webassemblyjs/leb128': 1.11.1 '@webassemblyjs/utf8': 1.11.1 - /@webassemblyjs/wasm-parser/1.9.0: - resolution: {integrity: sha512-9+wkMowR2AmdSWQzsPEjFU7njh8HTO5MqO8vjwEHuM+AMHioNqSBONRdr0NQQ3dVQrzp0s8lTcYqzUdb7YgELA==} - dependencies: - '@webassemblyjs/ast': 1.9.0 - '@webassemblyjs/helper-api-error': 1.9.0 - '@webassemblyjs/helper-wasm-bytecode': 1.9.0 - '@webassemblyjs/ieee754': 1.9.0 - '@webassemblyjs/leb128': 1.9.0 - '@webassemblyjs/utf8': 1.9.0 - dev: true - - /@webassemblyjs/wast-parser/1.9.0: - resolution: {integrity: sha512-qsqSAP3QQ3LyZjNC/0jBJ/ToSxfYJ8kYyuiGvtn/8MK89VrNEfwj7BPQzJVHi0jGTRK2dGdJ5PRqhtjzoww+bw==} - dependencies: - '@webassemblyjs/ast': 1.9.0 - '@webassemblyjs/floating-point-hex-parser': 1.9.0 - '@webassemblyjs/helper-api-error': 1.9.0 - '@webassemblyjs/helper-code-frame': 1.9.0 - '@webassemblyjs/helper-fsm': 1.9.0 - '@xtuc/long': 4.2.2 - dev: true - /@webassemblyjs/wast-printer/1.11.1: resolution: {integrity: sha512-IQboUWM4eKzWW+N/jij2sRatKMh99QEelo3Eb2q0qXkvPRISAj8Qxtmw5itwqK+TTkBuUIE45AxYPToqPtL5gg==} dependencies: '@webassemblyjs/ast': 1.11.1 '@xtuc/long': 4.2.2 - /@webassemblyjs/wast-printer/1.9.0: - resolution: {integrity: sha512-2J0nE95rHXHyQ24cWjMKJ1tqB/ds8z/cyeOZxJhcb+rW+SQASVjuznUSmdz5GpVJTzU8JkhYut0D3siFDD6wsA==} - dependencies: - '@webassemblyjs/ast': 1.9.0 - '@webassemblyjs/wast-parser': 1.9.0 - '@xtuc/long': 4.2.2 - dev: true - /@webpack-cli/configtest/1.0.4_webpack-cli@4.8.0+webpack@5.51.1: resolution: {integrity: sha512-cs3XLy+UcxiP6bj0A6u7MLLuwdXJ1c3Dtc0RkKg+wiI1g/Ti1om8+/2hc2A2B60NbBNAbMgyBMHvyymWm/j4wQ==} peerDependencies: @@ -8029,14 +7697,6 @@ packages: react: 17.0.2 react-is: 16.13.1 - /ajv-errors/1.0.1_ajv@6.12.6: - resolution: {integrity: sha512-DCRfO/4nQ+89p/RK43i8Ezd41EqdGIU4ld7nGF8OQ14oc/we5rEntLCUa7+jrn3nn83BosfwZA0wb4pon2o8iQ==} - peerDependencies: - ajv: '>=5.0.0' - dependencies: - ajv: 6.12.6 - dev: true - /ajv-keywords/3.5.2_ajv@6.12.6: resolution: {integrity: sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==} peerDependencies: @@ -8076,11 +7736,6 @@ packages: dependencies: ansi-wrap: 0.1.0 - /ansi-colors/3.2.4: - resolution: {integrity: sha512-hHUXGagefjN2iRrID63xckIvotOXOojhQKWIPUZ4mNUZ9nLZW+7FMNoE1lOkEhNWYsx/7ysGIuJYCiMAA9FnrA==} - engines: {node: '>=6'} - dev: true - /ansi-colors/4.1.1: resolution: {integrity: sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==} engines: {node: '>=6'} @@ -8420,13 +8075,6 @@ packages: engines: {node: '>=0.8'} dev: false - /assert/1.5.0: - resolution: {integrity: sha512-EDsgawzwoun2CZkCgtxJbv392v4nbk9XDD06zI+kQYoBM/3RBWLlEyJARDOmhAAosBjWACEkKL6S+lIZtcAubA==} - dependencies: - object-assign: 4.1.1 - util: 0.10.3 - dev: true - /assert/2.0.0: resolution: {integrity: sha512-se5Cd+js9dXJnu6Ag2JFc00t+HmHOen+8Q+L7O9zI0PqQXr20uk2J0XQqMxZEeo5U50o8Nvmmx7dZrl+Ufr35A==} dependencies: @@ -8689,21 +8337,6 @@ packages: schema-utils: 2.7.1 webpack: 5.51.1 - /babel-loader/8.2.2_be352a5a80662835a7707f972edfcfde: - resolution: {integrity: sha512-JvTd0/D889PQBtUXJ2PXaKU/pjZDMtHA9V2ecm+eNRmmBCMR09a+fmpGTNwnJtFmFl5Ei7Vy47LjBb+L0wQ99g==} - engines: {node: '>= 8.9'} - peerDependencies: - '@babel/core': ^7.0.0 - webpack: '>=2' - dependencies: - '@babel/core': 7.15.0 - find-cache-dir: 3.3.1 - loader-utils: 1.4.0 - make-dir: 3.1.0 - schema-utils: 2.7.1 - webpack: 4.46.0 - dev: true - /babel-messages/6.23.0: resolution: {integrity: sha1-8830cDhYA1sqKVHG7F7fbGLyYw4=} dependencies: @@ -9363,14 +8996,6 @@ packages: resolution: {integrity: sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk=} dev: true - /buffer/4.9.2: - resolution: {integrity: sha512-xq+q3SRMOxGivLhBNaUdC64hDTQwejJ+H0T/NB1XMtTVEwNTrfFF3gAxiyW0Bu/xWEGhjVKgUcMhCrUy2+uCWg==} - dependencies: - base64-js: 1.5.1 - ieee754: 1.2.1 - isarray: 1.0.0 - dev: true - /buffer/5.7.1: resolution: {integrity: sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==} dependencies: @@ -9427,26 +9052,6 @@ packages: yargs-parser: 20.2.9 dev: true - /cacache/12.0.4: - resolution: {integrity: sha512-a0tMB40oefvuInr4Cwb3GerbL9xTj1D5yg0T5xrjGCGyfvbxseIXX7BAO/u/hIXdafzOI5JC3wDwHyf24buOAQ==} - dependencies: - bluebird: 3.7.2 - chownr: 1.1.4 - figgy-pudding: 3.5.2 - glob: 7.1.6 - graceful-fs: 4.2.4 - infer-owner: 1.0.4 - lru-cache: 5.1.1 - mississippi: 3.0.0 - mkdirp: 0.5.5 - move-concurrently: 1.0.1 - promise-inflight: 1.0.1 - rimraf: 2.7.1 - ssri: 6.0.2 - unique-filename: 1.1.1 - y18n: 4.0.1 - dev: true - /cacache/15.0.6: resolution: {integrity: sha512-g1WYDMct/jzW+JdWEyjaX2zoBkZ6ZT9VpOyp2I/VMtDsNLffNat3kqPFfi1eDRSK9/SuKGyORDHcQMcPF8sQ/w==} engines: {node: '>= 10'} @@ -10265,17 +9870,6 @@ packages: engines: {node: '>= 0.6'} dev: false - /copy-concurrently/1.0.5: - resolution: {integrity: sha512-f2domd9fsVDFtaFcbaRZuYXwtdmnzqbADSwhSWYxYB/Q8zsdUUFMXVRwXGDMWmbEzAn1kdRrtI1T/KTFOL4X2A==} - dependencies: - aproba: 1.2.0 - fs-write-stream-atomic: 1.0.10 - iferr: 0.1.5 - mkdirp: 0.5.5 - rimraf: 2.7.1 - run-queue: 1.0.3 - dev: true - /copy-descriptor/0.1.1: resolution: {integrity: sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=} engines: {node: '>=0.10.0'} @@ -10510,28 +10104,6 @@ packages: postcss: 7.0.36 timsort: 0.3.0 - /css-loader/3.6.0_webpack@4.46.0: - resolution: {integrity: sha512-M5lSukoWi1If8dhQAUCvj4H8vUt3vOnwbQBH9DdTm/s4Ym2B/3dPMtYZeJmq7Q3S3Pa+I94DcZ7pc9bP14cWIQ==} - engines: {node: '>= 8.9.0'} - peerDependencies: - webpack: ^4.0.0 || ^5.0.0 - dependencies: - camelcase: 5.3.1 - cssesc: 3.0.0 - icss-utils: 4.1.1 - loader-utils: 1.4.0 - normalize-path: 3.0.0 - postcss: 7.0.36 - postcss-modules-extract-imports: 2.0.0 - postcss-modules-local-by-default: 3.0.3 - postcss-modules-scope: 2.2.0 - postcss-modules-values: 3.0.0 - postcss-value-parser: 4.1.0 - schema-utils: 2.7.1 - semver: 6.3.0 - webpack: 4.46.0 - dev: true - /css-loader/5.1.1_webpack@5.51.1: resolution: {integrity: sha512-5FfhpjwtuRgxqmusDidowqmLlcb+1HgnEDMsi2JhiUrZUcoc+cqw+mUtMIF/+OfeMYaaFCLYp1TaIt9H6I/fKA==} engines: {node: '>= 10.13.0'} @@ -10784,10 +10356,6 @@ packages: fs-exists-sync: 0.1.0 dev: true - /cyclist/1.0.1: - resolution: {integrity: sha1-WW6WmP0MgOEgOMK4LW6xs1tiJNk=} - dev: true - /d/1.0.1: resolution: {integrity: sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==} dependencies: @@ -11162,11 +10730,6 @@ packages: ssr-window: 3.0.0 dev: false - /domain-browser/1.2.0: - resolution: {integrity: sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA==} - engines: {node: '>=0.4', npm: '>=1.2'} - dev: true - /domain-browser/4.22.0: resolution: {integrity: sha512-IGBwjF7tNk3cwypFNH/7bfzBcgSCbaMOD3GsaY1AU/JRrnHnYgEM0+9kQt52iZxjNsjBtJYtao146V+f8jFZNw==} engines: {node: '>=10'} @@ -11229,12 +10792,6 @@ packages: dependencies: is-obj: 2.0.0 - /dotenv-defaults/1.1.1: - resolution: {integrity: sha512-6fPRo9o/3MxKvmRZBD3oNFdxODdhJtIy1zcJeUSCs6HCy4tarUpd+G67UTU9tF6OWXeSPqsm4fPAB+2eY9Rt9Q==} - dependencies: - dotenv: 6.2.0 - dev: true - /dotenv-defaults/2.0.2: resolution: {integrity: sha512-iOIzovWfsUHU91L5i8bJce3NYK5JXeAwH50Jh6+ARUdLiiGlYWfGw6UkzsYqaXZH/hjE/eCd/PlfM/qqyK0AMg==} dependencies: @@ -11245,15 +10802,6 @@ packages: resolution: {integrity: sha512-YXQl1DSa4/PQyRfgrv6aoNjhasp/p4qs9FjJ4q4cQk+8m4r6k4ZSiEyytKG8f8W9gi8WsQtIObNmKd+tMzNTmA==} dev: true - /dotenv-webpack/1.8.0_webpack@4.46.0: - resolution: {integrity: sha512-o8pq6NLBehtrqA8Jv8jFQNtG9nhRtVqmoD4yWbgUyoU3+9WBlPe+c2EAiaJok9RB28QvrWvdWLZGeTT5aATDMg==} - peerDependencies: - webpack: ^1 || ^2 || ^3 || ^4 - dependencies: - dotenv-defaults: 1.1.1 - webpack: 4.46.0 - dev: true - /dotenv-webpack/7.0.3_webpack@5.51.1: resolution: {integrity: sha512-O0O9pOEwrk+n1zzR3T2uuXRlw64QxHSPeNN1GaiNBloQFNaCUL9V8jxSVz4jlXXFP/CIqK8YecWf8BAvsSgMjw==} engines: {node: '>=10'} @@ -11264,11 +10812,6 @@ packages: webpack: 5.51.1 dev: true - /dotenv/6.2.0: - resolution: {integrity: sha512-HygQCKUBSFl8wKQZBSemMywRWcEDNidvNbjGVyZu3nbZ8qq9ubiPoGLMdRDpfSrpkkm9BXYFkpKxxFX38o/76w==} - engines: {node: '>=6'} - dev: true - /dotenv/8.6.0: resolution: {integrity: sha512-IrPdXQsk2BbzvCBGBOTmmSH5SodmqZNt4ERAZDmW4CT+tL8VtvinqywuANaFu4bOMWki16nqf0e4oC0QIaDr/g==} engines: {node: '>=10'} @@ -11444,15 +10987,6 @@ packages: objectorarray: 1.0.5 dev: true - /enhanced-resolve/4.5.0: - resolution: {integrity: sha512-Nv9m36S/vxpsI+Hc4/ZGRs0n9mXqSWGGq49zxb/cJfPAQMbUtttJAlNPS4AQzaBdw/pKskw5bMbekT/Y7W/Wlg==} - engines: {node: '>=6.9.0'} - dependencies: - graceful-fs: 4.2.4 - memory-fs: 0.5.0 - tapable: 1.1.3 - dev: true - /enhanced-resolve/5.8.2: resolution: {integrity: sha512-F27oB3WuHDzvR2DOGNTaYy0D5o0cnrv8TeI482VM4kYgQd/FT9lUQwuNsJ0oOHtBUq7eiW5ytqzp7nBFknL+GA==} engines: {node: '>=10.13.0'} @@ -12032,14 +11566,6 @@ packages: eslint: 7.31.0 dev: true - /eslint-scope/4.0.3: - resolution: {integrity: sha512-p7VutNr1O/QrxysMo3E45FjYDTeXBy0iTltPFNSqKAIfjDSXC+4dj+qfyuD8bfAXrW/y6lW3O76VaYNPKfpKrg==} - engines: {node: '>=4.0.0'} - dependencies: - esrecurse: 4.3.0 - estraverse: 4.3.0 - dev: true - /eslint-scope/5.1.1: resolution: {integrity: sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==} engines: {node: '>=8.0.0'} @@ -12542,10 +12068,6 @@ packages: - supports-color dev: true - /figgy-pudding/3.5.2: - resolution: {integrity: sha512-0btnI/H8f2pavGMN8w40mlSKOfTK2SVJmBfBeVIj3kNw0swwgzyRq0d5TJVOwodFmtvpPeWPN/MCcfuWF0Ezbw==} - dev: true - /figures/1.7.0: resolution: {integrity: sha1-y+Hjr/zxzUS4DK3+0o3Hk6lwHS4=} engines: {node: '>=0.10.0'} @@ -12574,17 +12096,6 @@ packages: flat-cache: 3.0.4 dev: true - /file-loader/6.2.0_webpack@4.46.0: - resolution: {integrity: sha512-qo3glqyTa61Ytg4u73GultjHGjdRyig3tG6lPtyX/jOEJvHif9uB0/OCI2Kif6ctF3caQTW2G5gym21oAsI4pw==} - engines: {node: '>= 10.13.0'} - peerDependencies: - webpack: ^4.0.0 || ^5.0.0 - dependencies: - loader-utils: 2.0.0 - schema-utils: 3.1.1 - webpack: 4.46.0 - dev: true - /file-loader/6.2.0_webpack@5.51.1: resolution: {integrity: sha512-qo3glqyTa61Ytg4u73GultjHGjdRyig3tG6lPtyX/jOEJvHif9uB0/OCI2Kif6ctF3caQTW2G5gym21oAsI4pw==} engines: {node: '>= 10.13.0'} @@ -12997,13 +12508,6 @@ packages: engines: {node: '>= 0.6'} dev: true - /from2/2.3.0: - resolution: {integrity: sha1-i/tVAr3kpNNs/e6gB/zKIdfjgq8=} - dependencies: - inherits: 2.0.4 - readable-stream: 2.3.7 - dev: true - /fromentries/1.3.2: resolution: {integrity: sha512-cHEpEQHUg0f8XdtZCc2ZAhrHzKzT0MrFUTcvx+hfxYu7rGMDc5SKoXFh+n4YigxsHXRzc6OrCshdR1bWH6HHyg==} dev: true @@ -13075,15 +12579,6 @@ packages: /fs-readdir-recursive/1.1.0: resolution: {integrity: sha512-GNanXlVr2pf02+sPN40XN8HG+ePaNcvM0q5mZBd668Obwb0yD5GiUbZOFgwn8kGMY6I3mdyDJzieUy3PTYyTRA==} - /fs-write-stream-atomic/1.0.10: - resolution: {integrity: sha1-tH31NJPvkR33VzHnCp3tAYnbQMk=} - dependencies: - graceful-fs: 4.2.4 - iferr: 0.1.5 - imurmurhash: 0.1.4 - readable-stream: 2.3.7 - dev: true - /fs.realpath/1.0.0: resolution: {integrity: sha1-FQStJSMVjKpA20onh8sBQRmU6k8=} @@ -14022,24 +13517,6 @@ packages: resolution: {integrity: sha512-uE/TxKuyNIcx44cIWnjr/rfIATDH7ZaOMmstu0CwhFG1Dunhlp4OC6/NMbhiwoq5BpW0ubi303qnEk/PZj614w==} dev: true - /html-webpack-plugin/4.5.2_webpack@4.46.0: - resolution: {integrity: sha512-q5oYdzjKUIPQVjOosjgvCHQOv9Ett9CYYHlgvJeXG0qQvdSojnBq4vAdQBwn1+yGveAwHCoe/rMR86ozX3+c2A==} - engines: {node: '>=6.9'} - peerDependencies: - webpack: ^4.0.0 || ^5.0.0 - dependencies: - '@types/html-minifier-terser': 5.1.2 - '@types/tapable': 1.0.8 - '@types/webpack': 4.41.30 - html-minifier-terser: 5.1.1 - loader-utils: 1.4.0 - lodash: 4.17.21 - pretty-error: 2.1.2 - tapable: 1.1.3 - util.promisify: 1.0.0 - webpack: 4.46.0 - dev: true - /html-webpack-plugin/5.3.2_webpack@5.51.1: resolution: {integrity: sha512-HvB33boVNCz2lTyBsSiMffsJ+m0YLIQ+pskblXgN9fnjS1BgEcuAfdInfXfGrkdXV406k9FiDi86eVCDBgJOyQ==} engines: {node: '>=10.13.0'} @@ -14179,13 +13656,6 @@ packages: dependencies: safer-buffer: 2.1.2 - /icss-utils/4.1.1: - resolution: {integrity: sha512-4aFq7wvWyMHKgxsH8QQtGpvbASCf+eM3wPRLI6R+MgAnTCZ6STYsRvttLvRWK0Nfif5piF394St3HeJDaljGPA==} - engines: {node: '>= 6'} - dependencies: - postcss: 7.0.36 - dev: true - /icss-utils/5.1.0_postcss@8.3.6: resolution: {integrity: sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA==} engines: {node: ^10 || ^12 || >= 14} @@ -14197,10 +13667,6 @@ packages: /ieee754/1.2.1: resolution: {integrity: sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==} - /iferr/0.1.5: - resolution: {integrity: sha1-xg7taebY/bazEEofy8ocGS3FtQE=} - dev: true - /ignore/4.0.6: resolution: {integrity: sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==} engines: {node: '>= 4'} @@ -14261,10 +13727,6 @@ packages: once: 1.4.0 wrappy: 1.0.2 - /inherits/2.0.1: - resolution: {integrity: sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE=} - dev: true - /inherits/2.0.3: resolution: {integrity: sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=} dev: true @@ -14837,11 +14299,6 @@ packages: resolution: {integrity: sha512-5SMO8RVennx3nZrqtKwCGyyetPE9VDba5ugvKLaD4KopPG5kR4mQ7tNt/r7feL5yt5h3lpuBbIUmCOG2eSzXHA==} dev: true - /is-wsl/1.1.0: - resolution: {integrity: sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0=} - engines: {node: '>=4'} - dev: true - /is-wsl/2.2.0: resolution: {integrity: sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==} engines: {node: '>=8'} @@ -16181,11 +15638,6 @@ packages: strip-bom: 3.0.0 dev: true - /loader-runner/2.4.0: - resolution: {integrity: sha512-Jsmr89RcXGIwivFY21FcRrisYZfvLMTWx5kOLc+JTxtpBOG6xML0vzbc6SEQG2FO9/4Fc3wW4LVcB5DmGflaRw==} - engines: {node: '>=4.3.0 <5.0.0 || >=5.10'} - dev: true - /loader-runner/4.2.0: resolution: {integrity: sha512-92+huvxMvYlMzMt0iIOukcwYBFpkYJdpl2xsZ7LrlayO7E8SOv+JJUEK17B/dJIHAOLMfh2dZZ/Y18WgmGtYNw==} engines: {node: '>=6.11.5'} @@ -16397,12 +15849,6 @@ packages: highlight.js: 10.7.3 dev: true - /lru-cache/5.1.1: - resolution: {integrity: sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==} - dependencies: - yallist: 3.1.1 - dev: true - /lru-cache/6.0.0: resolution: {integrity: sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==} engines: {node: '>=10'} @@ -16650,21 +16096,6 @@ packages: map-or-similar: 1.5.0 dev: true - /memory-fs/0.4.1: - resolution: {integrity: sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=} - dependencies: - errno: 0.1.8 - readable-stream: 2.3.7 - dev: true - - /memory-fs/0.5.0: - resolution: {integrity: sha512-jA0rdU5KoQMC0e6ppoNRtpp6vjFq6+NY7r8hywnC7V+1Xj/MtHwGIbB1QaK/dunyjWteJzmkpd7ooeWg10T7GA==} - engines: {node: '>=4.3.0 <5.0.0 || >=5.10'} - dependencies: - errno: 0.1.8 - readable-stream: 2.3.7 - dev: true - /memorystream/0.3.1: resolution: {integrity: sha1-htcJCzDORV1j+64S3aUaR93K+bI=} engines: {node: '>= 0.10.0'} @@ -16769,12 +16200,6 @@ packages: hasBin: true dev: true - /mime/2.5.2: - resolution: {integrity: sha512-tqkh47FzKeCPD2PUiPB6pkbMzsCasjxAfC62/Wap5qrUWcb+sFasXUC5I3gYM5iBM8v/Qpn4UK0x+j0iHyFPDg==} - engines: {node: '>=4.0.0'} - hasBin: true - dev: true - /mimic-fn/1.2.0: resolution: {integrity: sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==} engines: {node: '>=4'} @@ -16869,22 +16294,6 @@ packages: minipass: 3.1.3 yallist: 4.0.0 - /mississippi/3.0.0: - resolution: {integrity: sha512-x471SsVjUtBRtcvd4BzKE9kFC+/2TeWgKCgw0bZcw1b9l2X3QX5vCWgF+KaZaYm87Ss//rHnWryupDrgLvmSkA==} - engines: {node: '>=4.0.0'} - dependencies: - concat-stream: 1.6.2 - duplexify: 3.7.1 - end-of-stream: 1.4.4 - flush-write-stream: 1.1.1 - from2: 2.3.0 - parallel-transform: 1.2.0 - pump: 3.0.0 - pumpify: 1.5.1 - stream-each: 1.2.3 - through2: 2.0.5 - dev: true - /mitt/2.1.0: resolution: {integrity: sha512-ILj2TpLiysu2wkBbWjAmww7TkZb65aiQO+DkVdUTBpBXq+MHYiETENkKFMtsJZX1Lf4pe4QOrTSjIfUwN5lRdg==} dev: false @@ -16968,17 +16377,6 @@ packages: /mousetrap/1.6.5: resolution: {integrity: sha512-QNo4kEepaIBwiT8CDhP98umTetp+JNfQYBWvC1pc6/OAibuXtRcxZ58Qz8skvEHYvURne/7R8T5VoOI7rDsEUA==} - /move-concurrently/1.0.1: - resolution: {integrity: sha1-viwAX9oy4LKa8fBdfEszIUxwH5I=} - dependencies: - aproba: 1.2.0 - copy-concurrently: 1.0.5 - fs-write-stream-atomic: 1.0.10 - mkdirp: 0.5.5 - rimraf: 2.7.1 - run-queue: 1.0.3 - dev: true - /mri/1.1.6: resolution: {integrity: sha512-oi1b3MfbyGa7FJMP9GmLTttni5JoICpYBRlq+x5V16fZbLsnL9N3wFqqIm/nIG43FjUFkFh9Epzp/kzUGUnJxQ==} engines: {node: '>=4'} @@ -17120,34 +16518,6 @@ packages: /node-int64/0.4.0: resolution: {integrity: sha1-h6kGXNs1XTGC2PlM4RGIuCXGijs=} - /node-libs-browser/2.2.1: - resolution: {integrity: sha512-h/zcD8H9kaDZ9ALUWwlBUDo6TKF8a7qBSCSEGfjTVIYeqsioSKaAX+BN7NgiMGp6iSIXZ3PxgCu8KS3b71YK5Q==} - dependencies: - assert: 1.5.0 - browserify-zlib: 0.2.0 - buffer: 4.9.2 - console-browserify: 1.2.0 - constants-browserify: 1.0.0 - crypto-browserify: 3.12.0 - domain-browser: 1.2.0 - events: 3.3.0 - https-browserify: 1.0.0 - os-browserify: 0.3.0 - path-browserify: 0.0.1 - process: 0.11.10 - punycode: 1.3.2 - querystring-es3: 0.2.1 - readable-stream: 2.3.7 - stream-browserify: 2.0.2 - stream-http: 2.8.3 - string_decoder: 1.3.0 - timers-browserify: 2.0.12 - tty-browserify: 0.0.0 - url: 0.11.0 - util: 0.11.1 - vm-browserify: 1.1.2 - dev: true - /node-modules-regexp/1.0.0: resolution: {integrity: sha1-jZ2+KJZKSsVxLpExZCEHxx6Q7EA=} engines: {node: '>=0.10.0'} @@ -17713,14 +17083,6 @@ packages: resolution: {integrity: sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==} dev: true - /parallel-transform/1.2.0: - resolution: {integrity: sha512-P2vSmIu38uIlvdcU7fDkyrxj33gTUy/ABO5ZUbGowxNCopBq/OoD42bP4UmMrJoPyk4Uqf0mu3mtWBhHCZD8yg==} - dependencies: - cyclist: 1.0.1 - inherits: 2.0.4 - readable-stream: 2.3.7 - dev: true - /param-case/3.0.4: resolution: {integrity: sha512-RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A==} dependencies: @@ -17825,10 +17187,6 @@ packages: resolution: {integrity: sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=} engines: {node: '>=0.10.0'} - /path-browserify/0.0.1: - resolution: {integrity: sha512-BapA40NHICOS+USX9SN4tyhq+A2RrN/Ws5F0Z5aMHDp98Fl86lX8Oti8B7uN93L4Ifv4fHOEA+pQw87gmMO/lQ==} - dev: true - /path-browserify/1.0.1: resolution: {integrity: sha512-b7uo2UCUOYZcnF/3ID0lulOJi/bafxa1xPe7ZPsammBSpjSWQkjNxlt635YGS2MiR9GjvuXCtz2emr3jbsz98g==} dev: true @@ -18075,15 +17433,6 @@ packages: engines: {node: '>=4'} dev: false - /pnp-webpack-plugin/1.6.4: - resolution: {integrity: sha512-7Wjy+9E3WwLOEL30D+m8TSTF7qJJUJLONBnwQp0518siuMxUQUbgZwssaFX+QKlZkjHZcw/IpZCt/H0srrntSg==} - engines: {node: '>=6'} - dependencies: - ts-pnp: 1.2.0 - transitivePeerDependencies: - - typescript - dev: true - /polished/4.1.3: resolution: {integrity: sha512-ocPAcVBUOryJEKe0z2KLd1l9EBa1r5mSwlKpExmrLzsnIzJo4axsoU9O2BjOTkDGDT4mZ0WFE5XKTlR3nLnZOA==} engines: {node: '>=10'} @@ -18176,28 +17525,6 @@ packages: dependencies: postcss: 7.0.36 - /postcss-flexbugs-fixes/4.2.1: - resolution: {integrity: sha512-9SiofaZ9CWpQWxOwRh1b/r85KD5y7GgvsNt1056k6OYLvWUun0czCvogfJgylC22uJTwW1KzY3Gz65NZRlvoiQ==} - dependencies: - postcss: 7.0.36 - dev: true - - /postcss-loader/4.3.0_postcss@7.0.36+webpack@4.46.0: - resolution: {integrity: sha512-M/dSoIiNDOo8Rk0mUqoj4kpGq91gcxCfb9PoyZVdZ76/AuhxylHDYZblNE8o+EQ9AMSASeMFEKxZf5aU6wlx1Q==} - engines: {node: '>= 10.13.0'} - peerDependencies: - postcss: ^7.0.0 || ^8.0.1 - webpack: ^4.0.0 || ^5.0.0 - dependencies: - cosmiconfig: 7.0.0 - klona: 2.0.4 - loader-utils: 2.0.0 - postcss: 7.0.36 - schema-utils: 3.0.0 - semver: 7.3.5 - webpack: 4.46.0 - dev: true - /postcss-loader/4.3.0_webpack@5.51.1: resolution: {integrity: sha512-M/dSoIiNDOo8Rk0mUqoj4kpGq91gcxCfb9PoyZVdZ76/AuhxylHDYZblNE8o+EQ9AMSASeMFEKxZf5aU6wlx1Q==} engines: {node: '>= 10.13.0'} @@ -18281,13 +17608,6 @@ packages: postcss: 7.0.36 postcss-selector-parser: 3.1.2 - /postcss-modules-extract-imports/2.0.0: - resolution: {integrity: sha512-LaYLDNS4SG8Q5WAWqIJgdHPJrDDr/Lv775rMBFUbgjTz6j34lUznACHcdRWroPvXANP2Vj7yNK57vp9eFqzLWQ==} - engines: {node: '>= 6'} - dependencies: - postcss: 7.0.36 - dev: true - /postcss-modules-extract-imports/3.0.0_postcss@8.3.6: resolution: {integrity: sha512-bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw==} engines: {node: ^10 || ^12 || >= 14} @@ -18296,16 +17616,6 @@ packages: dependencies: postcss: 8.3.6 - /postcss-modules-local-by-default/3.0.3: - resolution: {integrity: sha512-e3xDq+LotiGesympRlKNgaJ0PCzoUIdpH0dj47iWAui/kyTgh3CiAr1qP54uodmJhl6p9rN6BoNcdEDVJx9RDw==} - engines: {node: '>= 6'} - dependencies: - icss-utils: 4.1.1 - postcss: 7.0.36 - postcss-selector-parser: 6.0.5 - postcss-value-parser: 4.1.0 - dev: true - /postcss-modules-local-by-default/4.0.0_postcss@8.3.6: resolution: {integrity: sha512-sT7ihtmGSF9yhm6ggikHdV0hlziDTX7oFoXtuVWeDd3hHObNkcHRo9V3yg7vCAY7cONyxJC/XXCmmiHHcvX7bQ==} engines: {node: ^10 || ^12 || >= 14} @@ -18317,14 +17627,6 @@ packages: postcss-selector-parser: 6.0.5 postcss-value-parser: 4.1.0 - /postcss-modules-scope/2.2.0: - resolution: {integrity: sha512-YyEgsTMRpNd+HmyC7H/mh3y+MeFWevy7V1evVhJWewmMbjDHIbZbOXICC2y+m1xI1UVfIT1HMW/O04Hxyu9oXQ==} - engines: {node: '>= 6'} - dependencies: - postcss: 7.0.36 - postcss-selector-parser: 6.0.5 - dev: true - /postcss-modules-scope/3.0.0_postcss@8.3.6: resolution: {integrity: sha512-hncihwFA2yPath8oZ15PZqvWGkWf+XUfQgUGamS4LqoP1anQLOsOJw0vr7J7IwLpoY9fatA2qiGUGmuZL0Iqlg==} engines: {node: ^10 || ^12 || >= 14} @@ -18334,13 +17636,6 @@ packages: postcss: 8.3.6 postcss-selector-parser: 6.0.5 - /postcss-modules-values/3.0.0: - resolution: {integrity: sha512-1//E5jCBrZ9DmRX+zCtmQtRSV6PV42Ix7Bzj9GbwJceduuf7IqP8MgeTXuRDHOWj2m0VzZD5+roFWDuU8RQjcg==} - dependencies: - icss-utils: 4.1.1 - postcss: 7.0.36 - dev: true - /postcss-modules-values/4.0.0_postcss@8.3.6: resolution: {integrity: sha512-RDxHkAiEGI78gS2ofyvCsu7iycRv7oqw5xMWn9iMoR0N/7mf9D50ecQqUo5BZ9Zh2vH4bCUR/ktCqbB9m8vJjQ==} engines: {node: ^10 || ^12 || >= 14} @@ -18566,13 +17861,6 @@ packages: hasBin: true dev: true - /pretty-error/2.1.2: - resolution: {integrity: sha512-EY5oDzmsX5wvuynAByrmY0P0hcp+QpnAKbJng2A2MPjVKXCxrDSUkzghVJ4ZGPIv+JC4gX8fPUWscC0RtjsWGw==} - dependencies: - lodash: 4.17.21 - renderkid: 2.0.7 - dev: true - /pretty-error/3.0.4: resolution: {integrity: sha512-ytLFLfv1So4AO1UkoBF6GXQgJRaKbiSiGFICaOPNwQ3CMvBvXpLRubeQWyPGnsbV/t9ml9qto6IeCsho0aEvwQ==} dependencies: @@ -18908,17 +18196,6 @@ packages: unpipe: 1.0.0 dev: true - /raw-loader/4.0.2_webpack@4.46.0: - resolution: {integrity: sha512-ZnScIV3ag9A4wPX/ZayxL/jZH+euYb6FcUinPcgiQW0+UBtEv0O6Q3lGd3cqJ+GHH+rksEv3Pj99oxJ3u3VIKA==} - engines: {node: '>= 10.13.0'} - peerDependencies: - webpack: ^4.0.0 || ^5.0.0 - dependencies: - loader-utils: 2.0.0 - schema-utils: 3.1.1 - webpack: 4.46.0 - dev: true - /re-resizable/6.9.0: resolution: {integrity: sha512-3cUDG81ylyqI0Pdgle/RHwwRYq0ORZzsUaySOCO8IbEtNyaRtrIHYm/jMQ5pjcNiKCxR3vsSymIQZHwJq4gg2Q==} peerDependencies: @@ -19645,7 +18922,7 @@ packages: dependencies: array.prototype.flat: 1.2.4 global-cache: 1.2.1 - react-with-styles: 3.2.3 + react-with-styles: 3.2.3_react@17.0.2 /react-with-styles/3.2.3: resolution: {integrity: sha512-MTI1UOvMHABRLj5M4WpODfwnveHaip6X7QUMI2x6zovinJiBXxzhA9AJP7MZNaKqg1JRFtHPXZdroUC8KcXwlQ==} @@ -20622,12 +19899,6 @@ packages: /run-parallel/1.1.10: resolution: {integrity: sha512-zb/1OuZ6flOlH6tQyMPUrE3x3Ulxjlo9WIVXR4yVYi4H9UXQaeIsPbLn2R3O3vQCnDKkAl2qHiuocKKX4Tz/Sw==} - /run-queue/1.0.3: - resolution: {integrity: sha1-6Eg5bwV9Ij8kOGkkYY4laUFh7Ec=} - dependencies: - aproba: 1.2.0 - dev: true - /rungen/0.3.2: resolution: {integrity: sha1-QAwJ6+kU57F+C27zJjQA/Cq8fLM=} @@ -20802,15 +20073,6 @@ packages: loose-envify: 1.4.0 object-assign: 4.1.1 - /schema-utils/1.0.0: - resolution: {integrity: sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==} - engines: {node: '>= 4'} - dependencies: - ajv: 6.12.6 - ajv-errors: 1.0.1_ajv@6.12.6 - ajv-keywords: 3.5.2_ajv@6.12.6 - dev: true - /schema-utils/2.7.0: resolution: {integrity: sha512-0ilKFI6QQF5nxDZLFn2dMjvc4hjg/Wkg7rHd3jK6/A4a1Hl9VFdQWvgB1UMGoU94pad1P/8N7fMcEnLnSiju8A==} engines: {node: '>= 8.9.0'} @@ -21316,12 +20578,6 @@ packages: resolution: {integrity: sha512-q+8UfWDg9Itrg0yWK7oe5p/XRCJpJF9OBtXfOPgSJl+u3Xd5KI328RUEvUqSMVM9CiQUEf1QdBzJMkYGErj9QA==} dev: false - /ssri/6.0.2: - resolution: {integrity: sha512-cepbSq/neFK7xB6A50KHN0xHDotYzq58wWCa5LeWqnPrHG8GzfEjO/4O8kpmcGW+oaxkvhEJCWgbgNk4/ZV93Q==} - dependencies: - figgy-pudding: 3.5.2 - dev: true - /ssri/8.0.1: resolution: {integrity: sha512-97qShzy1AiyxvPNIkLWoGua7xoQzzPjQ0HAH4B0rWKo7SZ6USuPcrUiAFrws0UH8RrbWmgq3LMTObhPIHbbBeQ==} engines: {node: '>= 8'} @@ -21379,13 +20635,6 @@ packages: resolution: {integrity: sha512-7t+/wpKLanLzSnQPX8WAcuLCCeuSHoWdQuh9SB3xD0kNOM38DNf+0Oa+wmvxmYueRzkmh6IcdKFtvTa+ecgPDw==} dev: true - /stream-browserify/2.0.2: - resolution: {integrity: sha512-nX6hmklHs/gr2FuxYDltq8fJA1GDlxKQCz8O/IM4atRqBH8OORmBNgfvW5gG10GT/qQ9u0CzIvr2X5Pkt6ntqg==} - dependencies: - inherits: 2.0.4 - readable-stream: 2.3.7 - dev: true - /stream-browserify/3.0.0: resolution: {integrity: sha512-H73RAHsVBapbim0tU2JwwOiXUj+fikfiaoYAKHF3VJfA0pe2BCzkhAHBlLG6REzE+2WNZcxOXjK7lkso+9euLA==} dependencies: @@ -21393,26 +20642,9 @@ packages: readable-stream: 3.6.0 dev: true - /stream-each/1.2.3: - resolution: {integrity: sha512-vlMC2f8I2u/bZGqkdfLQW/13Zihpej/7PmSiMQsbYddxuTsJp8vRe2x2FvVExZg7FaOds43ROAuFJwPR4MTZLw==} - dependencies: - end-of-stream: 1.4.4 - stream-shift: 1.0.1 - dev: true - /stream-exhaust/1.0.2: resolution: {integrity: sha512-b/qaq/GlBK5xaq1yrK9/zFcyRSTNxmcZwFLGSTG0mXgZl/4Z6GgiyYOXOvY7N3eEvFRAG1bkDRz5EPGSvPYQlw==} - /stream-http/2.8.3: - resolution: {integrity: sha512-+TSkfINHDo4J+ZobQLWiMouQYB+UVYFttRA94FpEzzJ7ZdqcL4uUUQ7WkdkI4DSozGmgBUE/a47L+38PenXhUw==} - dependencies: - builtin-status-codes: 3.0.0 - inherits: 2.0.4 - readable-stream: 2.3.7 - to-arraybuffer: 1.0.1 - xtend: 4.0.2 - dev: true - /stream-http/3.2.0: resolution: {integrity: sha512-Oq1bLqisTyK3TSCXpPbT4sdeYNdmyZJv1LxpEm2vu1ZhK89kSE5YXwZc3cWk0MagGaKriBh9mCFbVGtO+vY29A==} dependencies: @@ -21605,17 +20837,6 @@ packages: resolution: {integrity: sha1-dQ/JMxUqfTWvC3Qg5lF4m5FMw14=} dev: false - /style-loader/1.3.0_webpack@4.46.0: - resolution: {integrity: sha512-V7TCORko8rs9rIqkSrlMfkqA63DfoGBBJmK1kKGCcSi+BWb4cqz0SRsnp4l6rU5iwOEd0/2ePv68SV22VXon4Q==} - engines: {node: '>= 8.9.0'} - peerDependencies: - webpack: ^4.0.0 || ^5.0.0 - dependencies: - loader-utils: 2.0.0 - schema-utils: 2.7.1 - webpack: 4.46.0 - dev: true - /style-loader/2.0.0_webpack@5.51.1: resolution: {integrity: sha512-Z0gYUJmzZ6ZdRUqpg1r8GsaFKypE+3xAzuFeMuoHgjc9KZv3wMyCRjQIWEbhoFSq7+7yoHXySDJyyWQaPajeiQ==} engines: {node: '>= 10.13.0'} @@ -21943,42 +21164,6 @@ packages: through2: 3.0.2 dev: false - /terser-webpack-plugin/1.4.5_webpack@4.46.0: - resolution: {integrity: sha512-04Rfe496lN8EYruwi6oPQkG0vo8C+HT49X687FZnpPF0qMAIHONI6HEXYPKDOE8e5HjXTyKfqRd/agHtH0kOtw==} - engines: {node: '>= 6.9.0'} - peerDependencies: - webpack: ^4.0.0 - dependencies: - cacache: 12.0.4 - find-cache-dir: 2.1.0 - is-wsl: 1.1.0 - schema-utils: 1.0.0 - serialize-javascript: 4.0.0 - source-map: 0.6.1 - terser: 4.8.0 - webpack: 4.46.0 - webpack-sources: 1.4.3 - worker-farm: 1.7.0 - dev: true - - /terser-webpack-plugin/4.2.3_webpack@4.46.0: - resolution: {integrity: sha512-jTgXh40RnvOrLQNgIkwEKnQ8rmHjHK4u+6UBEi+W+FPmvb+uo+chJXntKe7/3lW5mNysgSWD60KyesnhW8D6MQ==} - engines: {node: '>= 10.13.0'} - peerDependencies: - webpack: ^4.0.0 || ^5.0.0 - dependencies: - cacache: 15.0.6 - find-cache-dir: 3.3.1 - jest-worker: 26.6.2 - p-limit: 3.1.0 - schema-utils: 3.1.1 - serialize-javascript: 5.0.1 - source-map: 0.6.1 - terser: 5.7.0 - webpack: 4.46.0 - webpack-sources: 1.4.3 - dev: true - /terser-webpack-plugin/5.1.4_webpack@5.51.1: resolution: {integrity: sha512-C2WkFwstHDhVEmsmlCxrXUtVklS+Ir1A7twrYzrDrQQOIMOaVAYykaoo/Aq1K0QRkMoY2hhvDQY1cm4jnIMFwA==} engines: {node: '>= 10.13.0'} @@ -22147,10 +21332,6 @@ packages: is-absolute: 1.0.0 is-negated-glob: 1.0.0 - /to-arraybuffer/1.0.1: - resolution: {integrity: sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M=} - dev: true - /to-fast-properties/1.0.3: resolution: {integrity: sha1-uDVx+k2MJbguIxsG46MFXeTKGkc=} engines: {node: '>=0.10.0'} @@ -22282,16 +21463,6 @@ packages: /ts-essentials/2.0.12: resolution: {integrity: sha512-3IVX4nI6B5cc31/GFFE+i8ey/N2eA0CZDbo6n0yrz0zDX8ZJ8djmU1p+XRz7G3is0F3bB3pu2pAroFdAWQKU3w==} - /ts-pnp/1.2.0: - resolution: {integrity: sha512-csd+vJOb/gkzvcCHgTGSChYpy5f1/XKNsmvBGO4JXS+z1v2HobugDz4s1IeFXM3wZB44uczs+eazB5Q/ccdhQw==} - engines: {node: '>=6'} - peerDependencies: - typescript: '*' - peerDependenciesMeta: - typescript: - optional: true - dev: true - /tsconfig-paths/3.10.1: resolution: {integrity: sha512-rETidPDgCpltxF7MjBZlAFPUHv5aHH2MymyPvh+vEyWAED4Eb/WeMbsnD/JDr4OKPOA1TssDHgIcpTN5Kh0p6Q==} dependencies: @@ -22332,10 +21503,6 @@ packages: typescript: 4.3.5 dev: true - /tty-browserify/0.0.0: - resolution: {integrity: sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY=} - dev: true - /tty-browserify/0.0.1: resolution: {integrity: sha512-C3TaO7K81YvjCgQH9Q1S3R3P3BtN3RIM8n+OvX4il1K1zgE8ZhI0op7kClgkxtutIE8hQrcrHBXvIheqKUUCxw==} dev: true @@ -22658,23 +21825,6 @@ packages: resolution: {integrity: sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=} deprecated: Please see https://github.com/lydell/urix#deprecated - /url-loader/4.1.1_file-loader@6.2.0+webpack@4.46.0: - resolution: {integrity: sha512-3BTV812+AVHHOJQO8O5MkWgZ5aosP7GnROJwvzLS9hWDj00lZ6Z0wNak423Lp9PBZN05N+Jk/N5Si8jRAlGyWA==} - engines: {node: '>= 10.13.0'} - peerDependencies: - file-loader: '*' - webpack: ^4.0.0 || ^5.0.0 - peerDependenciesMeta: - file-loader: - optional: true - dependencies: - file-loader: 6.2.0_webpack@4.46.0 - loader-utils: 2.0.0 - mime-types: 2.1.28 - schema-utils: 3.0.0 - webpack: 4.46.0 - dev: true - /url-loader/4.1.1_file-loader@6.2.0+webpack@5.51.1: resolution: {integrity: sha512-3BTV812+AVHHOJQO8O5MkWgZ5aosP7GnROJwvzLS9hWDj00lZ6Z0wNak423Lp9PBZN05N+Jk/N5Si8jRAlGyWA==} engines: {node: '>= 10.13.0'} @@ -22788,13 +21938,6 @@ packages: /util-deprecate/1.0.2: resolution: {integrity: sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=} - /util.promisify/1.0.0: - resolution: {integrity: sha512-i+6qA2MPhvoKLuxnJNpXAGhg7HphQOSUq2LKMZD0m15EiskXUkMvKdF4Uui0WYeCUGea+o2cw/ZuwehtfsrNkA==} - dependencies: - define-properties: 1.1.3 - object.getownpropertydescriptors: 2.1.2 - dev: true - /util.promisify/1.0.1: resolution: {integrity: sha512-g9JpC/3He3bm38zsLupWryXHoEcS22YHthuPQSJdMy6KNrzIRzWqcsHzD/WUnqe45whVou4VIsPew37DoXWNrA==} dependencies: @@ -22803,18 +21946,6 @@ packages: has-symbols: 1.0.2 object.getownpropertydescriptors: 2.1.2 - /util/0.10.3: - resolution: {integrity: sha1-evsa/lCAUkZInj23/g7TeTNqwPk=} - dependencies: - inherits: 2.0.1 - dev: true - - /util/0.11.1: - resolution: {integrity: sha512-HShAsny+zS2TZfaXxD9tYj4HQGlBezXZMZuM/S5PKLLoZkShZiGk9o5CzukI1LVHZvjdvZ2Sj1aW/Ndn2NB/HQ==} - dependencies: - inherits: 2.0.3 - dev: true - /util/0.12.4: resolution: {integrity: sha512-bxZ9qtSlGUWSOy9Qa9Xgk11kSslpuZwaxCg4sNIDj6FLucDab2JxnHwyNTCpHMtK1MjoQiWQ6DiUMZYbSrO+Sw==} dependencies: @@ -23022,23 +22153,6 @@ packages: dependencies: loose-envify: 1.4.0 - /watchpack-chokidar2/2.0.1: - resolution: {integrity: sha512-nCFfBIPKr5Sh61s4LPpy1Wtfi0HE8isJ3d2Yb5/Ppw2P2B/3eVSEBjKfN0fmHJSK14+31KwMKmcrzs2GM4P0Ww==} - dependencies: - chokidar: 2.1.8 - dev: true - optional: true - - /watchpack/1.7.5: - resolution: {integrity: sha512-9P3MWk6SrKjHsGkLT2KHXdQ/9SNkyoJbabxnKOoJepsvJjJG8uYTR3yTPxPQvNDI3w4Nz1xnE0TLHK4RIVe/MQ==} - dependencies: - graceful-fs: 4.2.4 - neo-async: 2.6.2 - optionalDependencies: - chokidar: 3.5.2 - watchpack-chokidar2: 2.0.1 - dev: true - /watchpack/2.2.0: resolution: {integrity: sha512-up4YAn/XHgZHIxFBVCdlMiWDj6WaLKpwVeGQk2I5thdYxF/KmF0aaz6TfJZ/hfl1h/XlcDr7k1KH7ThDagpFaA==} engines: {node: '>=10.13.0'} @@ -23097,20 +22211,6 @@ packages: webpack: 5.51.1_webpack-cli@4.8.0 webpack-merge: 5.7.3 - /webpack-dev-middleware/3.7.3_webpack@4.46.0: - resolution: {integrity: sha512-djelc/zGiz9nZj/U7PTBi2ViorGJXEWo/3ltkPbDyxCXhhEXkW0ce99falaok4TPj+AsxLiXJR0EBOb0zh9fKQ==} - engines: {node: '>= 6'} - peerDependencies: - webpack: ^4.0.0 || ^5.0.0 - dependencies: - memory-fs: 0.4.1 - mime: 2.5.2 - mkdirp: 0.5.5 - range-parser: 1.2.1 - webpack: 4.46.0 - webpack-log: 2.0.0 - dev: true - /webpack-dev-middleware/4.3.0_webpack@5.51.1: resolution: {integrity: sha512-PjwyVY95/bhBh6VUqt6z4THplYcsvQ8YNNBTBM873xLVmw8FLeALn0qurHbs9EmcfhzQis/eoqypSnZeuUz26w==} engines: {node: '>= v10.23.3'} @@ -23126,15 +22226,6 @@ packages: webpack: 5.51.1 dev: true - /webpack-filter-warnings-plugin/1.2.1_webpack@4.46.0: - resolution: {integrity: sha512-Ez6ytc9IseDMLPo0qCuNNYzgtUl8NovOqjIq4uAU8LTD4uoa1w1KpZyyzFtLTEMZpkkOkLfL9eN+KGYdk1Qtwg==} - engines: {node: '>= 4.3 < 5.0.0 || >= 5.10'} - peerDependencies: - webpack: ^2.0.0 || ^3.0.0 || ^4.0.0 - dependencies: - webpack: 4.46.0 - dev: true - /webpack-hot-middleware/2.25.0: resolution: {integrity: sha512-xs5dPOrGPCzuRXNi8F6rwhawWvQQkeli5Ro48PRuQh8pYPCPmNnltP9itiUPT4xI8oW+y0m59lyyeQk54s5VgA==} dependencies: @@ -23144,14 +22235,6 @@ packages: strip-ansi: 3.0.1 dev: true - /webpack-log/2.0.0: - resolution: {integrity: sha512-cX8G2vR/85UYG59FgkoMamwHUIkSSlV3bBMRsbxVXVUk2j6NleCKjQ/WE9eYg9WY4w25O9w8wKP4rzNZFmUcUg==} - engines: {node: '>= 6'} - dependencies: - ansi-colors: 3.2.4 - uuid: 3.4.0 - dev: true - /webpack-merge/5.7.3: resolution: {integrity: sha512-6/JUQv0ELQ1igjGDzHkXbVDRxkfA57Zw7PfiupdLFJYrgFqY5ZP8xxbpp2lU3EPwYx89ht5Z/aDkD40hFCm5AA==} engines: {node: '>=10.0.0'} @@ -23183,54 +22266,10 @@ packages: resolution: {integrity: sha512-fahN08Et7P9trej8xz/Z7eRu8ltyiygEo/hnRi9KqBUs80KeDcnf96ZJo++ewWd84fEf3xSX9bp4ZS9hbw0OBw==} engines: {node: '>=10.13.0'} - /webpack-virtual-modules/0.2.2: - resolution: {integrity: sha512-kDUmfm3BZrei0y+1NTHJInejzxfhtU8eDj2M7OKb2IWrPFAeO1SOH2KuQ68MSZu9IGEHcxbkKKR1v18FrUSOmA==} - dependencies: - debug: 3.2.7 - dev: true - /webpack-virtual-modules/0.4.3: resolution: {integrity: sha512-5NUqC2JquIL2pBAAo/VfBP6KuGkHIZQXW/lNKupLPfhViwh8wNsu0BObtl09yuKZszeEUfbXz8xhrHvSG16Nqw==} dev: true - /webpack/4.46.0: - resolution: {integrity: sha512-6jJuJjg8znb/xRItk7bkT0+Q7AHCYjjFnvKIWQPkNIOyRqoCGvkOs0ipeQzrqz4l5FtN5ZI/ukEHroeX/o1/5Q==} - engines: {node: '>=6.11.5'} - hasBin: true - peerDependencies: - webpack-cli: '*' - webpack-command: '*' - peerDependenciesMeta: - webpack-cli: - optional: true - webpack-command: - optional: true - dependencies: - '@webassemblyjs/ast': 1.9.0 - '@webassemblyjs/helper-module-context': 1.9.0 - '@webassemblyjs/wasm-edit': 1.9.0 - '@webassemblyjs/wasm-parser': 1.9.0 - acorn: 6.4.2 - ajv: 6.12.6 - ajv-keywords: 3.5.2_ajv@6.12.6 - chrome-trace-event: 1.0.3 - enhanced-resolve: 4.5.0 - eslint-scope: 4.0.3 - json-parse-better-errors: 1.0.2 - loader-runner: 2.4.0 - loader-utils: 1.4.0 - memory-fs: 0.4.1 - micromatch: 3.1.10 - mkdirp: 0.5.5 - neo-async: 2.6.2 - node-libs-browser: 2.2.1 - schema-utils: 1.0.0 - tapable: 1.1.3 - terser-webpack-plugin: 1.4.5_webpack@4.46.0 - watchpack: 1.7.5 - webpack-sources: 1.4.3 - dev: true - /webpack/5.51.1: resolution: {integrity: sha512-xsn3lwqEKoFvqn4JQggPSRxE4dhsRcysWTqYABAZlmavcoTmwlOb9b1N36Inbt/eIispSkuHa80/FJkDTPos1A==} engines: {node: '>=10.13.0'} @@ -23410,12 +22449,6 @@ packages: resolution: {integrity: sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==} engines: {node: '>=0.10.0'} - /worker-farm/1.7.0: - resolution: {integrity: sha512-rvw3QTZc8lAxyVrqcSGVm5yP/IJ2UcB3U0graE3LCFoZ0Yn2x4EoVSqJKdB/T5M+FLcRPjz4TDacRf3OCfNUzw==} - dependencies: - errno: 0.1.8 - dev: true - /worker-rpc/0.1.1: resolution: {integrity: sha512-P1WjMrUB3qgJNI9jfmpZ/htmBEjFh//6l/5y8SD9hg1Ef5zTTVVoRjTrTEzPrNBQvmhMxkoTsjOXN10GWU7aCg==} dependencies: @@ -23528,10 +22561,6 @@ packages: resolution: {integrity: sha512-hsRUr4FFrvhhRH12wOdfs38Gy7k2FFzB9qgN9v3aLykRq0dRcdcpz5C9FxdS2NuhOrI/628b/KSTJ3rwHysYSg==} engines: {node: '>=10'} - /yallist/3.1.1: - resolution: {integrity: sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==} - dev: true - /yallist/4.0.0: resolution: {integrity: sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==} diff --git a/projects/packages/connection/CHANGELOG.md b/projects/packages/connection/CHANGELOG.md index 8f4273a5c39b5..c7fd2a9bf7704 100644 --- a/projects/packages/connection/CHANGELOG.md +++ b/projects/packages/connection/CHANGELOG.md @@ -5,6 +5,10 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [1.30.4] - 2021-09-02 +### Fixed +- Remove invalid user token before reconnect. + ## [1.30.3] - 2021-08-30 ### Added - Limit repeated failed attempts to update remote DNA package versions. @@ -408,6 +412,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Separate the connection library into its own package. +[1.30.4]: https://github.com/Automattic/jetpack-connection/compare/v1.30.3...v1.30.4 [1.30.3]: https://github.com/Automattic/jetpack-connection/compare/v1.30.2...v1.30.3 [1.30.2]: https://github.com/Automattic/jetpack-connection/compare/v1.30.1...v1.30.2 [1.30.1]: https://github.com/Automattic/jetpack-connection/compare/v1.30.0...v1.30.1 diff --git a/projects/packages/connection/src/class-manager.php b/projects/packages/connection/src/class-manager.php index ae7c4c53a64b7..64ab116d8176a 100644 --- a/projects/packages/connection/src/class-manager.php +++ b/projects/packages/connection/src/class-manager.php @@ -821,36 +821,38 @@ public function connect_user( $user_id = null, $redirect_url = null ) { * * @param Integer $user_id the user identifier. * @param bool $can_overwrite_primary_user Allow for the primary user to be disconnected. + * @param bool $force_disconnect_locally Disconnect user locally even if we were unable to disconnect them from WP.com. * @return Boolean Whether the disconnection of the user was successful. */ - public function disconnect_user( $user_id = null, $can_overwrite_primary_user = false ) { + public function disconnect_user( $user_id = null, $can_overwrite_primary_user = false, $force_disconnect_locally = false ) { $user_id = empty( $user_id ) ? get_current_user_id() : (int) $user_id; // Attempt to disconnect the user from WordPress.com. $is_disconnected_from_wpcom = $this->unlink_user_from_wpcom( $user_id ); - if ( ! $is_disconnected_from_wpcom ) { - return false; - } - // Disconnect the user locally. - $is_disconnected_locally = $this->get_tokens()->disconnect_user( $user_id, $can_overwrite_primary_user ); - if ( $is_disconnected_locally ) { - // Delete cached connected user data. - $transient_key = "jetpack_connected_user_data_$user_id"; - delete_transient( $transient_key ); + $is_disconnected_locally = false; + if ( $is_disconnected_from_wpcom || $force_disconnect_locally ) { + // Disconnect the user locally. + $is_disconnected_locally = $this->get_tokens()->disconnect_user( $user_id, $can_overwrite_primary_user ); - /** - * Fires after the current user has been unlinked from WordPress.com. - * - * @since 1.7.0 - * @since-jetpack 4.1.0 - * - * @param int $user_id The current user's ID. - */ - do_action( 'jetpack_unlinked_user', $user_id ); + if ( $is_disconnected_locally ) { + // Delete cached connected user data. + $transient_key = "jetpack_connected_user_data_$user_id"; + delete_transient( $transient_key ); + + /** + * Fires after the current user has been unlinked from WordPress.com. + * + * @since 1.7.0 + * @since-jetpack 4.1.0 + * + * @param int $user_id The current user's ID. + */ + do_action( 'jetpack_unlinked_user', $user_id ); + } } - return $is_disconnected_locally; + return $is_disconnected_from_wpcom && $is_disconnected_locally; } /** @@ -2428,7 +2430,7 @@ public function refresh_blog_token() { */ public function refresh_user_token() { ( new Tracking() )->record_user_event( 'restore_connection_refresh_user_token' ); - $this->disconnect_user( null, true ); + $this->disconnect_user( null, true, true ); return true; } diff --git a/projects/packages/connection/src/class-package-version.php b/projects/packages/connection/src/class-package-version.php index 0843da040c47d..bf6400232909f 100644 --- a/projects/packages/connection/src/class-package-version.php +++ b/projects/packages/connection/src/class-package-version.php @@ -12,7 +12,7 @@ */ class Package_Version { - const PACKAGE_VERSION = '1.30.3'; + const PACKAGE_VERSION = '1.30.4'; const PACKAGE_SLUG = 'connection'; diff --git a/projects/packages/sync/changelog/fix-jetpack-sync-checksum-better-woo-handling b/projects/packages/sync/changelog/fix-jetpack-sync-checksum-better-woo-handling new file mode 100644 index 0000000000000..aa0fe234366f5 --- /dev/null +++ b/projects/packages/sync/changelog/fix-jetpack-sync-checksum-better-woo-handling @@ -0,0 +1,4 @@ +Significance: patch +Type: fixed + +Add better checks if the WooCommerce tables should be enabled for checksum/fix. diff --git a/projects/packages/sync/src/class-package-version.php b/projects/packages/sync/src/class-package-version.php index c275b0a688bd5..d62b1d483bb06 100644 --- a/projects/packages/sync/src/class-package-version.php +++ b/projects/packages/sync/src/class-package-version.php @@ -12,7 +12,7 @@ */ class Package_Version { - const PACKAGE_VERSION = '1.26.0'; + const PACKAGE_VERSION = '1.26.1-alpha'; const PACKAGE_SLUG = 'sync'; diff --git a/projects/packages/sync/src/class-replicastore.php b/projects/packages/sync/src/class-replicastore.php index e85ecf90b918c..840ce43467ddc 100644 --- a/projects/packages/sync/src/class-replicastore.php +++ b/projects/packages/sync/src/class-replicastore.php @@ -16,14 +16,6 @@ * This is useful to compare values in the local WP DB to values in the synced replica store */ class Replicastore implements Replicastore_Interface { - /** - * On WordPress.com, we can't directly check if the site has support for WooCommerce. - * Having the option to override the functionality here helps with syncing WooCommerce tables. - * - * @var bool Force support for WooCommerce functionality. - */ - public static $force_woocommerce_support = false; - /** * Empty and reset the replicastore. * @@ -1205,7 +1197,18 @@ public function checksum_all( $perform_text_conversion = false ) { /** * WooCommerce tables */ - if ( static::$force_woocommerce_support || class_exists( 'WooCommerce' ) ) { + + /** + * On WordPress.com, we can't directly check if the site has support for WooCommerce. + * Having the option to override the functionality here helps with syncing WooCommerce tables. + * + * @since 10.1 + * + * @param bool If we should we force-enable WooCommerce tables support. + */ + $force_woocommerce_support = apply_filters( 'jetpack_table_checksum_force_enable_woocommerce', false ); + + if ( $force_woocommerce_support || class_exists( 'WooCommerce' ) ) { /** * Guard in Try/Catch as it's possible for the WooCommerce class to exist, but * the tables to not. If we don't do this, the response will be just the exception, without diff --git a/projects/packages/sync/src/replicastore/class-table-checksum.php b/projects/packages/sync/src/replicastore/class-table-checksum.php index 11cc7647096c3..c1c74a69ed223 100644 --- a/projects/packages/sync/src/replicastore/class-table-checksum.php +++ b/projects/packages/sync/src/replicastore/class-table-checksum.php @@ -122,6 +122,13 @@ class Table_Checksum { */ private $table_join_field = null; + /** + * Some tables might not exist on the remote, and we want to verify they exist, before trying to query them. + * + * @var callable + */ + private $is_table_enabled_callback = false; + /** * Table_Checksum constructor. * @@ -156,6 +163,13 @@ public function __construct( $table, $salt = null, $perform_text_conversion = fa $this->prepare_fields( $this->table_configuration ); + // Run any callbacks to check if a table is enabled or not. + if ( + is_callable( $this->is_table_enabled_callback ) + && ! call_user_func( $this->is_table_enabled_callback, $table ) + ) { + throw new Exception( "Unable to use table name: $table" ); + } } /** @@ -248,21 +262,23 @@ private function get_default_tables() { 'links' => $wpdb->links, // TODO describe in the array format or add exceptions. 'options' => $wpdb->options, // TODO describe in the array format or add exceptions. 'woocommerce_order_items' => array( - 'table' => "{$wpdb->prefix}woocommerce_order_items", - 'range_field' => 'order_item_id', - 'key_fields' => array( 'order_item_id' ), - 'checksum_fields' => array( 'order_id' ), - 'checksum_text_fields' => array( 'order_item_name', 'order_item_type' ), + 'table' => "{$wpdb->prefix}woocommerce_order_items", + 'range_field' => 'order_item_id', + 'key_fields' => array( 'order_item_id' ), + 'checksum_fields' => array( 'order_id' ), + 'checksum_text_fields' => array( 'order_item_name', 'order_item_type' ), + 'is_table_enabled_callback' => array( $this, 'enable_woocommerce_tables' ), ), 'woocommerce_order_itemmeta' => array( - 'table' => "{$wpdb->prefix}woocommerce_order_itemmeta", - 'range_field' => 'order_item_id', - 'key_fields' => array( 'order_item_id', 'meta_key' ), - 'checksum_text_fields' => array( 'meta_key', 'meta_value' ), - 'filter_values' => Sync\Settings::get_allowed_order_itemmeta_structured(), - 'parent_table' => 'woocommerce_order_items', - 'parent_join_field' => 'order_item_id', - 'table_join_field' => 'order_item_id', + 'table' => "{$wpdb->prefix}woocommerce_order_itemmeta", + 'range_field' => 'order_item_id', + 'key_fields' => array( 'order_item_id', 'meta_key' ), + 'checksum_text_fields' => array( 'meta_key', 'meta_value' ), + 'filter_values' => Sync\Settings::get_allowed_order_itemmeta_structured(), + 'parent_table' => 'woocommerce_order_items', + 'parent_join_field' => 'order_item_id', + 'table_join_field' => 'order_item_id', + 'is_table_enabled_callback' => array( $this, 'enable_woocommerce_tables' ), ), ); } @@ -273,15 +289,16 @@ private function get_default_tables() { * @param array $table_configuration The table configuration array. */ private function prepare_fields( $table_configuration ) { - $this->key_fields = $table_configuration['key_fields']; - $this->range_field = $table_configuration['range_field']; - $this->checksum_fields = isset( $table_configuration['checksum_fields'] ) ? $table_configuration['checksum_fields'] : array(); - $this->checksum_text_fields = isset( $table_configuration['checksum_text_fields'] ) ? $table_configuration['checksum_text_fields'] : array(); - $this->filter_values = isset( $table_configuration['filter_values'] ) ? $table_configuration['filter_values'] : null; - $this->additional_filter_sql = ! empty( $table_configuration['filter_sql'] ) ? $table_configuration['filter_sql'] : ''; - $this->parent_table = isset( $table_configuration['parent_table'] ) ? $table_configuration['parent_table'] : null; - $this->parent_join_field = isset( $table_configuration['parent_join_field'] ) ? $table_configuration['parent_join_field'] : $table_configuration['range_field']; - $this->table_join_field = isset( $table_configuration['table_join_field'] ) ? $table_configuration['table_join_field'] : $table_configuration['range_field']; + $this->key_fields = $table_configuration['key_fields']; + $this->range_field = $table_configuration['range_field']; + $this->checksum_fields = isset( $table_configuration['checksum_fields'] ) ? $table_configuration['checksum_fields'] : array(); + $this->checksum_text_fields = isset( $table_configuration['checksum_text_fields'] ) ? $table_configuration['checksum_text_fields'] : array(); + $this->filter_values = isset( $table_configuration['filter_values'] ) ? $table_configuration['filter_values'] : null; + $this->additional_filter_sql = ! empty( $table_configuration['filter_sql'] ) ? $table_configuration['filter_sql'] : ''; + $this->parent_table = isset( $table_configuration['parent_table'] ) ? $table_configuration['parent_table'] : null; + $this->parent_join_field = isset( $table_configuration['parent_join_field'] ) ? $table_configuration['parent_join_field'] : $table_configuration['range_field']; + $this->table_join_field = isset( $table_configuration['table_join_field'] ) ? $table_configuration['table_join_field'] : $table_configuration['range_field']; + $this->is_table_enabled_callback = isset( $table_configuration['is_table_enabled_callback'] ) ? $table_configuration['is_table_enabled_callback'] : false; } /** @@ -301,8 +318,6 @@ private function validate_table_name( $table ) { throw new Exception( "Invalid table name: $table not allowed" ); } - // TODO other checks if such are needed. - return $this->allowed_tables[ $table ]['table']; } @@ -749,4 +764,37 @@ public function calculate_checksum( $range_from = null, $range_to = null, $filte return $this->prepare_results_for_output( $result ); } } + + /** + * Make sure the WooCommerce tables should be enabled for Checksum/Fix. + * + * @return bool + */ + private function enable_woocommerce_tables() { + /** + * On WordPress.com, we can't directly check if the site has support for WooCommerce. + * Having the option to override the functionality here helps with syncing WooCommerce tables. + * + * @since 10.1 + * + * @param bool If we should we force-enable WooCommerce tables support. + */ + $force_woocommerce_support = apply_filters( 'jetpack_table_checksum_force_enable_woocommerce', false ); + + // If we're forcing WooCommerce tables support, there's no need to check further. + // This is used on WordPress.com. + if ( $force_woocommerce_support ) { + return true; + } + + // No need to proceed if WooCommerce is not available. + if ( ! class_exists( 'WooCommerce' ) ) { + return false; + } + + // TODO more checks if needed. Probably query the DB to make sure the tables exist. + + return true; + } + } diff --git a/projects/plugins/backup/changelog/fix-backup-dashboard-styling b/projects/plugins/backup/changelog/fix-backup-dashboard-styling new file mode 100644 index 0000000000000..4feec3575444b --- /dev/null +++ b/projects/plugins/backup/changelog/fix-backup-dashboard-styling @@ -0,0 +1,4 @@ +Significance: patch +Type: fixed + +Adjust dashboard styling. diff --git a/projects/plugins/backup/src/js/components/Admin.js b/projects/plugins/backup/src/js/components/Admin.js index a04ad24d4a4c3..d17a4ff6341db 100644 --- a/projects/plugins/backup/src/js/components/Admin.js +++ b/projects/plugins/backup/src/js/components/Admin.js @@ -160,10 +160,6 @@ const Admin = () => { } }; - const renderManageConnection = () => { - return renderConnectionStatusCard(); - }; - // Renders additional segments under the jp-hero area condition on having a backup plan const renderBackupSegments = () => { return ( @@ -211,6 +207,8 @@ const Admin = () => {

) } + + { renderConnectionStatusCard() } ); @@ -221,18 +219,7 @@ const Admin = () => {
{ renderLoadedState() }
-
- { isFullyConnected() && renderBackupSegments() } - { isFullyConnected() && ( -
-
-
-
- { renderManageConnection() } -
-
- ) } -
+
{ isFullyConnected() && renderBackupSegments() }
); diff --git a/projects/plugins/backup/src/js/components/Backups.js b/projects/plugins/backup/src/js/components/Backups.js index a1e4bb2d91569..9e67166dc54fe 100644 --- a/projects/plugins/backup/src/js/components/Backups.js +++ b/projects/plugins/backup/src/js/components/Backups.js @@ -37,6 +37,8 @@ const Backups = () => { } ); const domain = useSelect( select => select( STORE_ID ).getCalypsoSlug(), [] ); + const assetBuildUrl = useSelect( select => select( STORE_ID ).getAssetBuildUrl(), [] ); + const BACKUP_STATE = { LOADING: 0, IN_PROGRESS: 1, @@ -152,9 +154,9 @@ const Backups = () => {
- - - + + +
); @@ -177,7 +179,7 @@ const Backups = () => {
- +

{ __( 'Latest Backup', 'jetpack-backup' ) }

{ formatDateString( latestTime ) }

@@ -193,28 +195,28 @@ const Backups = () => {
diff --git a/projects/plugins/backup/src/js/components/admin-style.scss b/projects/plugins/backup/src/js/components/admin-style.scss index 503da9bcaab08..6975ff53fc91f 100644 --- a/projects/plugins/backup/src/js/components/admin-style.scss +++ b/projects/plugins/backup/src/js/components/admin-style.scss @@ -37,6 +37,16 @@ font-weight: 500; } + .jp-section { + h2, h3 { + margin-bottom: 14px; + } + + p { + margin-top: 14px; + } + } + p, li { font-size: 16px; line-height: 1.5; @@ -69,6 +79,7 @@ background: var( --jp-black ); text-decoration: none; border-radius: var( --jp-border-radius ); + border: 0; &.is-full-width { width: 100%; diff --git a/projects/plugins/backup/src/js/components/rna-styles.scss b/projects/plugins/backup/src/js/components/rna-styles.scss index 710b66c1b3821..d99b9e2a80869 100644 --- a/projects/plugins/backup/src/js/components/rna-styles.scss +++ b/projects/plugins/backup/src/js/components/rna-styles.scss @@ -6,7 +6,7 @@ --font-title-small: 24px; --font-body: 16px; --font-label: 12px; - + --jp-black: #000000; --jp-black-80: #2C3338; --jp-white: #FFFFFF; @@ -64,12 +64,12 @@ body { grid-template-columns: repeat(4, 1fr); width: 100%; margin: 0 16px; - + @include for-phone-up { grid-template-columns: repeat(8, 1fr); margin: 0 18px; } - + @include for-tablet-up { grid-template-columns: repeat(12, 1fr); max-width: 1128px; @@ -125,12 +125,12 @@ body { grid-template-columns: repeat(4, 1fr); width: 100%; margin: 0 16px; - + @include for-phone-up { grid-template-columns: repeat(8, 1fr); margin: 0 18px; } - + @include for-tablet-up { grid-template-columns: repeat(12, 1fr); max-width: 1128px; @@ -141,11 +141,11 @@ body { .jp-cut { position: relative; display: block; - margin: 32px 0; padding: 16px 64px 16px 24px; border: 2px solid var( --jp-green-primary ); border-radius: var( --jp-border-radius ); text-decoration: none; + margin: 24px 0 32px; span { display: block; @@ -180,4 +180,4 @@ body { transform: translateY( -50% ); transition: transform 0.15s ease-out; } -} \ No newline at end of file +} diff --git a/projects/plugins/jetpack/changelog/fix-tiled-gallery-transform-again b/projects/plugins/jetpack/changelog/fix-tiled-gallery-transform-again new file mode 100644 index 0000000000000..3c4aa3e141385 --- /dev/null +++ b/projects/plugins/jetpack/changelog/fix-tiled-gallery-transform-again @@ -0,0 +1,5 @@ +Significance: patch +Type: bugfix +Comment: Fixes an issue with transform to tiled gallery block not working for galleries with more than 3 images + + diff --git a/projects/plugins/jetpack/changelog/jetpack-branch-10.1 b/projects/plugins/jetpack/changelog/jetpack-branch-10.1 new file mode 100644 index 0000000000000..1eaea6a769e84 --- /dev/null +++ b/projects/plugins/jetpack/changelog/jetpack-branch-10.1 @@ -0,0 +1,4 @@ +Significance: patch +Type: other + +Updated package dependencies. diff --git a/projects/plugins/jetpack/changelog/update-videopress-block-edit-icon b/projects/plugins/jetpack/changelog/update-videopress-block-edit-icon new file mode 100644 index 0000000000000..a287f741ebfe8 --- /dev/null +++ b/projects/plugins/jetpack/changelog/update-videopress-block-edit-icon @@ -0,0 +1,4 @@ +Significance: patch +Type: enhancement + +Updated the edit icon design in the VideoPress block toolbar. diff --git a/projects/plugins/jetpack/changelog/update-widget-visibility-editor-readme b/projects/plugins/jetpack/changelog/update-widget-visibility-editor-readme new file mode 100644 index 0000000000000..954c43f73f14c --- /dev/null +++ b/projects/plugins/jetpack/changelog/update-widget-visibility-editor-readme @@ -0,0 +1,5 @@ +Significance: patch +Type: other +Comment: Widget Visibility build tools: adjust command in readme + + diff --git a/projects/plugins/jetpack/extensions/blocks/tiled-gallery/edit.js b/projects/plugins/jetpack/extensions/blocks/tiled-gallery/edit.js index b70b3752be0ea..94d8506076418 100644 --- a/projects/plugins/jetpack/extensions/blocks/tiled-gallery/edit.js +++ b/projects/plugins/jetpack/extensions/blocks/tiled-gallery/edit.js @@ -66,7 +66,11 @@ export const pickRelevantMediaFiles = image => { class TiledGalleryEdit extends Component { state = { selectedImage: null, - changed: 'undefined' === typeof this.props.attributes.columnWidths ? true : false, + changed: + 'undefined' === typeof this.props.attributes.columnWidths || + this.props.attributes.columnWidths?.length === 0 + ? true + : false, }; static getDerivedStateFromProps( props, state ) { diff --git a/projects/plugins/jetpack/extensions/blocks/tiled-gallery/index.js b/projects/plugins/jetpack/extensions/blocks/tiled-gallery/index.js index 15baa4c8cd6d5..81d4c3f85bcf4 100644 --- a/projects/plugins/jetpack/extensions/blocks/tiled-gallery/index.js +++ b/projects/plugins/jetpack/extensions/blocks/tiled-gallery/index.js @@ -246,7 +246,6 @@ export const settings = { alt, } ) ), ids: validImages.map( ( { id } ) => id ), - columnWidths: [ [ '100.00000' ] ], } ); }, }, @@ -264,7 +263,6 @@ export const settings = { alt, } ) ), ids: validImages.map( ( { id } ) => id ), - columnWidths: [ [ '100.00000' ] ], } ); } return createBlock( `jetpack/${ name }` ); diff --git a/projects/plugins/jetpack/extensions/blocks/videopress/edit.js b/projects/plugins/jetpack/extensions/blocks/videopress/edit.js index b6321fffcfa86..927a3d3b1587d 100644 --- a/projects/plugins/jetpack/extensions/blocks/videopress/edit.js +++ b/projects/plugins/jetpack/extensions/blocks/videopress/edit.js @@ -25,6 +25,7 @@ import { } from '@wordpress/block-editor'; import { Component, createRef, Fragment } from '@wordpress/element'; import { __, _x, sprintf } from '@wordpress/i18n'; +import { Icon, pencil } from '@wordpress/icons'; import classnames from 'classnames'; import { get, indexOf } from 'lodash'; @@ -276,7 +277,7 @@ const VideoPressEdit = CoreVideoEdit => className="components-icon-button components-toolbar__control" label={ __( 'Edit video', 'jetpack' ) } onClick={ this.switchToEditing } - icon="edit" + icon={ } /> diff --git a/projects/plugins/jetpack/modules/widget-visibility/editor/README.md b/projects/plugins/jetpack/modules/widget-visibility/editor/README.md index 6d173896495e5..7a553d09683c5 100644 --- a/projects/plugins/jetpack/modules/widget-visibility/editor/README.md +++ b/projects/plugins/jetpack/modules/widget-visibility/editor/README.md @@ -7,4 +7,4 @@ This means that we can now develop a new interface to manage widget visibility s ## Build (& Watch) -This feature will be built via `pnpm run build-widget-visibility`, which is invoked in `pnpm build`. +This feature will be built via `pnpm run build-widget-visibility`, which is invoked in `jetpack build plugins/jetpack`.