diff --git a/plugins/woocommerce-admin/package.json b/plugins/woocommerce-admin/package.json index e4ed723c295..08c17be6c8f 100644 --- a/plugins/woocommerce-admin/package.json +++ b/plugins/woocommerce-admin/package.json @@ -71,7 +71,6 @@ "test:help": "wp-scripts test-unit-js --help", "test:php": "docker-compose -f docker/wc-admin-php-test-suite/docker-compose.yml run --rm phpunit", "posttest:php": "docker-compose -f docker/wc-admin-php-test-suite/docker-compose.yml down", - "postinstall": "patch-package", "test:update-snapshots": "pnpm run test:client -- --updateSnapshot && pnpm run --filter @woocommerce/components test:update-snapshots", "test:watch": "tsc --build || concurrently \"pnpm run test:client -- --watch\" \"pnpm run:packages -- test:nobuild --parallel -- --watch\"", "test:zip": "pnpm run clean && composer i && ./bin/build-test-zip.sh", @@ -96,7 +95,7 @@ }, "dependencies": { "@automattic/explat-client": "^0.0.3", - "@automattic/explat-client-react-helpers": "^0.0.3", + "@automattic/explat-client-react-helpers": "^0.0.4", "@automattic/interpolate-components": "^1.2.0", "@react-spring/web": "^9.4.3", "@woocommerce/api": "^0.2.0", @@ -256,7 +255,6 @@ "moment-timezone": "^0.5.34", "moment-timezone-data-webpack-plugin": "^1.5.0", "node-watch": "^0.7.3", - "patch-package": "^6.4.7", "postcss": "^8.4.7", "postcss-color-function": "^4.1.0", "postcss-loader": "^3.0.0", diff --git a/plugins/woocommerce-admin/packages/explat/package.json b/plugins/woocommerce-admin/packages/explat/package.json index e556f02ce56..968f7db2a7c 100644 --- a/plugins/woocommerce-admin/packages/explat/package.json +++ b/plugins/woocommerce-admin/packages/explat/package.json @@ -26,7 +26,7 @@ }, "dependencies": { "@automattic/explat-client": "^0.0.3", - "@automattic/explat-client-react-helpers": "^0.0.3", + "@automattic/explat-client-react-helpers": "^0.0.4", "@wordpress/api-fetch": "^6.0.1", "@wordpress/hooks": "^2.12.3", "cookie": "^0.4.2", diff --git a/plugins/woocommerce-admin/packages/explat/tsconfig.json b/plugins/woocommerce-admin/packages/explat/tsconfig.json index 9f49af1cdc4..75ce1c823b6 100644 --- a/plugins/woocommerce-admin/packages/explat/tsconfig.json +++ b/plugins/woocommerce-admin/packages/explat/tsconfig.json @@ -2,9 +2,6 @@ "extends": "../tsconfig", "compilerOptions": { "rootDir": "src", - "outDir": "build-module", - "paths": { - "@automattic/explat-client": [ "../../node_modules/@automattic/explat-client/src" ], - } + "outDir": "build-module" }, } \ No newline at end of file diff --git a/plugins/woocommerce-admin/patches/@automattic+explat-client-react-helpers+0.0.3.patch b/plugins/woocommerce-admin/patches/@automattic+explat-client-react-helpers+0.0.3.patch deleted file mode 100644 index 581da130857..00000000000 --- a/plugins/woocommerce-admin/patches/@automattic+explat-client-react-helpers+0.0.3.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff --git a/node_modules/@automattic/explat-client-react-helpers/dist/types/index.d.ts b/node_modules/@automattic/explat-client-react-helpers/dist/types/index.d.ts -index 594f134..22f31d1 100644 ---- a/node_modules/@automattic/explat-client-react-helpers/dist/types/index.d.ts -+++ b/node_modules/@automattic/explat-client-react-helpers/dist/types/index.d.ts -@@ -1,6 +1,6 @@ - import * as React from 'react'; - import type { ExPlatClient, ExperimentAssignment } from '@automattic/explat-client'; --interface ExperimentOptions { -+export interface ExperimentOptions { - /** - * Determines whether a participant is currenlty eligible for an assignment. - * - Only loads the experimentAssignment if isEligible is true. -@@ -8,7 +8,7 @@ interface ExperimentOptions { - */ - isEligible?: boolean; - } --interface ExPlatClientReactHelpers { -+export interface ExPlatClientReactHelpers { - /** - * An ExPlat useExperiment hook. - * -@@ -38,5 +38,5 @@ interface ExPlatClientReactHelpers { - }) => JSX.Element; - } - export default function createExPlatClientReactHelpers(exPlatClient: ExPlatClient): ExPlatClientReactHelpers; --export {}; -+// export {}; - //# sourceMappingURL=index.d.ts.map -\ No newline at end of file diff --git a/plugins/woocommerce-admin/pnpm-lock.yaml b/plugins/woocommerce-admin/pnpm-lock.yaml index 51c7507ac9e..d8cf75b26ab 100644 --- a/plugins/woocommerce-admin/pnpm-lock.yaml +++ b/plugins/woocommerce-admin/pnpm-lock.yaml @@ -6,7 +6,7 @@ importers: specifiers: '@automattic/color-studio': ^2.5.0 '@automattic/explat-client': ^0.0.3 - '@automattic/explat-client-react-helpers': ^0.0.3 + '@automattic/explat-client-react-helpers': ^0.0.4 '@automattic/interpolate-components': ^1.2.0 '@automattic/mini-css-extract-plugin-with-rtl': ^0.8.0 '@babel/cli': ^7.17.6 @@ -155,7 +155,6 @@ importers: moment-timezone: ^0.5.34 moment-timezone-data-webpack-plugin: ^1.5.0 node-watch: ^0.7.3 - patch-package: ^6.4.7 postcss: ^8.4.7 postcss-color-function: ^4.1.0 postcss-loader: ^3.0.0 @@ -192,7 +191,7 @@ importers: webpack-rtl-plugin: ^2.0.0 dependencies: '@automattic/explat-client': 0.0.3 - '@automattic/explat-client-react-helpers': 0.0.3 + '@automattic/explat-client-react-helpers': 0.0.4 '@automattic/interpolate-components': 1.2.0_react@17.0.2 '@react-spring/web': 9.4.3_react-dom@17.0.2+react@17.0.2 '@woocommerce/api': 0.2.0 @@ -351,7 +350,6 @@ importers: moment-timezone: 0.5.34 moment-timezone-data-webpack-plugin: 1.5.0_b101c74866574c83f416ce8084e5b692 node-watch: 0.7.3 - patch-package: 6.4.7 postcss: 8.4.7 postcss-color-function: 4.1.0 postcss-loader: 3.0.0 @@ -874,7 +872,7 @@ importers: packages/explat: specifiers: '@automattic/explat-client': ^0.0.3 - '@automattic/explat-client-react-helpers': ^0.0.3 + '@automattic/explat-client-react-helpers': ^0.0.4 '@babel/core': ^7.17.5 '@types/cookie': ^0.4.1 '@types/node': ^17.0.21 @@ -890,7 +888,7 @@ importers: typescript: ^4.6.2 dependencies: '@automattic/explat-client': 0.0.3 - '@automattic/explat-client-react-helpers': 0.0.3 + '@automattic/explat-client-react-helpers': 0.0.4 '@wordpress/api-fetch': 6.0.1 '@wordpress/hooks': 2.12.3 cookie: 0.4.2 @@ -1128,8 +1126,8 @@ packages: /@automattic/color-studio/2.5.0: resolution: {integrity: sha512-gZWaJbx3p1oennAIoJtMGluTmoM95Efk4rc44TSBxWSZZ8gH3Am2eh1o3i1NhrZmg2Zt3AiVFeZZ4AJccIpBKQ==} - /@automattic/explat-client-react-helpers/0.0.3: - resolution: {integrity: sha512-yHpWMm9Rfd1IG/mNic88PKaCbCB1w1v5rjMJMcL4HDYBBKk3T02MFncLIits5pPLTf6Zd8SiMWbDXzkjy/KvKg==} + /@automattic/explat-client-react-helpers/0.0.4: + resolution: {integrity: sha512-rS9cVNvWa54oZijIONk0pO/6/xdBBzDtETnRDDAyBQwbVNKlgQ1Ueu7bfGWPq9MXcR0pJ/dfSSlMcNIgR06Hnw==} dependencies: '@automattic/explat-client': 0.0.3 react: 17.0.2 @@ -7025,10 +7023,6 @@ packages: resolution: {integrity: sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==} dev: true - /@yarnpkg/lockfile/1.1.0: - resolution: {integrity: sha512-GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ==} - dev: true - /abab/2.0.5: resolution: {integrity: sha512-9IK9EadsbHo6jLWIpxpR6pL0sazTXV6+SQv25ZB+F7Bj9mJNaOc4nCRabwd5M/JwmUa8idz6Eci6eKfJryPs6Q==} @@ -11663,12 +11657,6 @@ packages: semver-regex: 3.1.3 dev: true - /find-yarn-workspace-root/2.0.0: - resolution: {integrity: sha512-1IMnbjt4KzsQfnhnzNd8wUEgXZ44IzZaZmnLYx7D5FZlaHt2gW20Cri8Q+E/t5tIj4+epTBub+2Zxu/vNILzqQ==} - dependencies: - micromatch: 4.0.4 - dev: true - /findup-sync/0.3.0: resolution: {integrity: sha1-N5MKpdgWt3fANEXhlmzGeQpMCxY=} engines: {node: '>= 0.6.0'} @@ -11948,15 +11936,6 @@ packages: rimraf: 2.7.1 dev: true - /fs-extra/7.0.1: - resolution: {integrity: sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==} - engines: {node: '>=6 <7 || >=8'} - dependencies: - graceful-fs: 4.2.9 - jsonfile: 4.0.0 - universalify: 0.1.2 - dev: true - /fs-extra/8.1.0: resolution: {integrity: sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==} engines: {node: '>=6 <7 || >=8'} @@ -15585,12 +15564,6 @@ packages: resolution: {integrity: sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==} engines: {node: '>=0.10.0'} - /klaw-sync/6.0.0: - resolution: {integrity: sha512-nIeuVSzdCCs6TDPTqI8w1Yre34sSq7AkZ4B3sfOBbI2CgVSB4Du4aLQijFU2+lhAFCwt9+42Hel6lQNIv6AntQ==} - dependencies: - graceful-fs: 4.2.9 - dev: true - /klaw/1.3.1: resolution: {integrity: sha1-QIhDO0azsbolnXh4XY6W9zugJDk=} optionalDependencies: @@ -17565,26 +17538,6 @@ packages: resolution: {integrity: sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=} engines: {node: '>=0.10.0'} - /patch-package/6.4.7: - resolution: {integrity: sha512-S0vh/ZEafZ17hbhgqdnpunKDfzHQibQizx9g8yEf5dcVk3KOflOfdufRXQX8CSEkyOQwuM/bNz1GwKvFj54kaQ==} - engines: {npm: '>5'} - hasBin: true - dependencies: - '@yarnpkg/lockfile': 1.1.0 - chalk: 2.4.2 - cross-spawn: 6.0.5 - find-yarn-workspace-root: 2.0.0 - fs-extra: 7.0.1 - is-ci: 2.0.0 - klaw-sync: 6.0.0 - minimist: 1.2.5 - open: 7.4.2 - rimraf: 2.7.1 - semver: 5.7.1 - slash: 2.0.0 - tmp: 0.0.33 - dev: true - /path-browserify/0.0.1: resolution: {integrity: sha512-BapA40NHICOS+USX9SN4tyhq+A2RrN/Ws5F0Z5aMHDp98Fl86lX8Oti8B7uN93L4Ifv4fHOEA+pQw87gmMO/lQ==} dev: true @@ -21467,6 +21420,7 @@ packages: engines: {node: '>=0.6.0'} dependencies: os-tmpdir: 1.0.2 + dev: false /tmp/0.2.1: resolution: {integrity: sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ==}