diff --git a/plugins/woocommerce/bin/build-zip.sh b/plugins/woocommerce/bin/build-zip.sh index 9d7675711aa..0dae45443fe 100755 --- a/plugins/woocommerce/bin/build-zip.sh +++ b/plugins/woocommerce/bin/build-zip.sh @@ -10,7 +10,7 @@ rm -rf "$BUILD_PATH" mkdir -p "$DEST_PATH" echo "Installing PHP and JS dependencies..." -pnpm run install:no-e2e +pnpm install composer install || exit "$?" echo "Running JS Build..." pnpm run build:core || exit "$?" diff --git a/plugins/woocommerce/bin/post-merge.sh b/plugins/woocommerce/bin/post-merge.sh index 598689495f5..b7d9ac1bab4 100755 --- a/plugins/woocommerce/bin/post-merge.sh +++ b/plugins/woocommerce/bin/post-merge.sh @@ -9,5 +9,5 @@ runOnChange() { fi } -runOnChange "package-lock.json" "pnpm run install:no-e2e" +runOnChange "package-lock.json" "pnpm install" runOnChange "composer.lock" "SKIP_UPDATE_TEXTDOMAINS=true composer install" diff --git a/plugins/woocommerce/package.json b/plugins/woocommerce/package.json index 44ae1790cf5..99764b6f6d5 100644 --- a/plugins/woocommerce/package.json +++ b/plugins/woocommerce/package.json @@ -15,10 +15,7 @@ "scripts": { "composer:install": "composer install", "composer:dump-autoload": "composer dump-autoload", - "check:subset-installed": "pnpm list --depth 1 install-subset > /dev/null 2>&1", "preinstall": "npx only-allow pnpm", - "install:subset-only": "pnpm install --no-package-lock --no-save install-subset", - "install:no-e2e": "pnpm run check:subset-installed --silent || pnpm run install:subset-only && pnpx install-subset i no-e2e", "build": "./bin/build-zip.sh", "build:core": "grunt && pnpm run makepot", "build-watch": "grunt watch", @@ -128,17 +125,5 @@ "> 0.1%", "ie 8", "ie 9" - ], - "subsets": { - "no-e2e": { - "exclude": [ - "@woocommerce/api", - "@woocommerce/api-core-tests", - "@woocommerce/e2e-core-tests", - "@woocommerce/e2e-environment", - "@woocommerce/e2e-utils", - "@wordpress/e2e-test-utils" - ] - } - } + ] } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index ad7efa07b34..4dba915cf93 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -159,12 +159,9 @@ importers: packages/js/e2e-utils: specifiers: -<<<<<<< HEAD '@automattic/puppeteer-utils': github:Automattic/puppeteer-utils#0f3ec50 -======= '@typescript-eslint/eslint-plugin': ^5.3.0 '@typescript-eslint/parser': ^5.3.0 ->>>>>>> trunk '@wordpress/deprecated': ^2.10.0 '@wordpress/e2e-test-utils': ^4.16.1 config: 3.3.3 @@ -416,7 +413,7 @@ packages: resolution: {integrity: sha512-ECmAKstXbp1cvpTTZciZCgfOt6iN64lR0d+euv3UZisU5awfRawOvg07Utn/qBGuH4bRIEZKrA/4LzZyXhZr8g==} engines: {node: '>=6.9.0'} dependencies: - '@babel/types': 7.15.6 + '@babel/types': 7.16.0 jsesc: 2.5.2 source-map: 0.5.7 @@ -456,7 +453,7 @@ packages: '@babel/compat-data': 7.15.0 '@babel/core': 7.12.9 '@babel/helper-validator-option': 7.14.5 - browserslist: 4.17.3 + browserslist: 4.17.6 semver: 6.3.0 dev: true @@ -489,6 +486,39 @@ packages: - supports-color dev: true + /@babel/helper-create-class-features-plugin/7.15.4_@babel+core@7.15.8: + resolution: {integrity: sha512-7ZmzFi+DwJx6A7mHRwbuucEYpyBwmh2Ca0RvI6z2+WLZYCqV0JOaLb+u0zbtmDicebgKBZgqbYfLaKNqSgv5Pw==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0 + dependencies: + '@babel/core': 7.15.8 + '@babel/helper-annotate-as-pure': 7.15.4 + '@babel/helper-function-name': 7.15.4 + '@babel/helper-member-expression-to-functions': 7.15.4 + '@babel/helper-optimise-call-expression': 7.15.4 + '@babel/helper-replace-supers': 7.15.4 + '@babel/helper-split-export-declaration': 7.15.4 + transitivePeerDependencies: + - supports-color + + /@babel/helper-create-class-features-plugin/7.16.0_@babel+core@7.12.9: + resolution: {integrity: sha512-XLwWvqEaq19zFlF5PTgOod4bUA+XbkR4WLQBct1bkzmxJGB0ZEJaoKF4c8cgH9oBtCDuYJ8BP5NB9uFiEgO5QA==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0 + dependencies: + '@babel/core': 7.12.9 + '@babel/helper-annotate-as-pure': 7.16.0 + '@babel/helper-function-name': 7.16.0 + '@babel/helper-member-expression-to-functions': 7.16.0 + '@babel/helper-optimise-call-expression': 7.16.0 + '@babel/helper-replace-supers': 7.16.0 + '@babel/helper-split-export-declaration': 7.16.0 + transitivePeerDependencies: + - supports-color + dev: true + /@babel/helper-create-class-features-plugin/7.16.0_@babel+core@7.15.8: resolution: {integrity: sha512-XLwWvqEaq19zFlF5PTgOod4bUA+XbkR4WLQBct1bkzmxJGB0ZEJaoKF4c8cgH9oBtCDuYJ8BP5NB9uFiEgO5QA==} engines: {node: '>=6.9.0'} @@ -523,7 +553,7 @@ packages: '@babel/core': ^7.0.0 dependencies: '@babel/core': 7.15.8 - '@babel/helper-annotate-as-pure': 7.16.0 + '@babel/helper-annotate-as-pure': 7.15.4 regexpu-core: 4.8.0 /@babel/helper-define-polyfill-provider/0.2.3_@babel+core@7.15.8: @@ -588,7 +618,6 @@ packages: engines: {node: '>=6.9.0'} dependencies: '@babel/types': 7.15.6 - dev: true /@babel/helper-member-expression-to-functions/7.16.0: resolution: {integrity: sha512-bsjlBFPuWT6IWhl28EdrQ+gTvSvj5tqVP5Xeftp07SEuz5pLnsXZuDkDD3Rfcxy0IsHmbZ+7B2/9SHzxO0T+sQ==} @@ -607,13 +636,13 @@ packages: engines: {node: '>=6.9.0'} dependencies: '@babel/helper-module-imports': 7.15.4 - '@babel/helper-replace-supers': 7.15.4 + '@babel/helper-replace-supers': 7.16.0 '@babel/helper-simple-access': 7.15.4 - '@babel/helper-split-export-declaration': 7.15.4 + '@babel/helper-split-export-declaration': 7.16.0 '@babel/helper-validator-identifier': 7.15.7 - '@babel/template': 7.15.4 - '@babel/traverse': 7.15.4 - '@babel/types': 7.15.6 + '@babel/template': 7.16.0 + '@babel/traverse': 7.16.0 + '@babel/types': 7.16.0 transitivePeerDependencies: - supports-color @@ -622,7 +651,6 @@ packages: engines: {node: '>=6.9.0'} dependencies: '@babel/types': 7.15.6 - dev: true /@babel/helper-optimise-call-expression/7.16.0: resolution: {integrity: sha512-SuI467Gi2V8fkofm2JPnZzB/SUuXoJA5zXe/xzyPP2M04686RzFKFHPK6HDVN6JvWBIEW8tt9hPR7fXdn2Lgpw==} @@ -713,9 +741,9 @@ packages: resolution: {integrity: sha512-V45u6dqEJ3w2rlryYYXf6i9rQ5YMNu4FLS6ngs8ikblhu2VdR1AqAd6aJjBzmf2Qzh6KOLqKHxEN9+TFbAkAVQ==} engines: {node: '>=6.9.0'} dependencies: - '@babel/template': 7.15.4 - '@babel/traverse': 7.15.4 - '@babel/types': 7.15.6 + '@babel/template': 7.16.0 + '@babel/traverse': 7.16.0 + '@babel/types': 7.16.0 transitivePeerDependencies: - supports-color @@ -782,7 +810,7 @@ packages: '@babel/core': ^7.0.0-0 dependencies: '@babel/core': 7.12.9 - '@babel/helper-create-class-features-plugin': 7.15.4_@babel+core@7.12.9 + '@babel/helper-create-class-features-plugin': 7.16.0_@babel+core@7.12.9 '@babel/helper-plugin-utils': 7.14.5 transitivePeerDependencies: - supports-color @@ -1044,7 +1072,7 @@ packages: '@babel/core': ^7.0.0-0 dependencies: '@babel/core': 7.15.8 - '@babel/helper-create-class-features-plugin': 7.16.0_@babel+core@7.15.8 + '@babel/helper-create-class-features-plugin': 7.15.4_@babel+core@7.15.8 '@babel/helper-plugin-utils': 7.14.5 transitivePeerDependencies: - supports-color @@ -1470,12 +1498,12 @@ packages: '@babel/core': ^7.0.0-0 dependencies: '@babel/core': 7.15.8 - '@babel/helper-annotate-as-pure': 7.16.0 - '@babel/helper-function-name': 7.16.0 - '@babel/helper-optimise-call-expression': 7.16.0 + '@babel/helper-annotate-as-pure': 7.15.4 + '@babel/helper-function-name': 7.15.4 + '@babel/helper-optimise-call-expression': 7.15.4 '@babel/helper-plugin-utils': 7.14.5 - '@babel/helper-replace-supers': 7.16.0 - '@babel/helper-split-export-declaration': 7.16.0 + '@babel/helper-replace-supers': 7.15.4 + '@babel/helper-split-export-declaration': 7.15.4 globals: 11.12.0 transitivePeerDependencies: - supports-color @@ -1616,7 +1644,7 @@ packages: '@babel/core': ^7.0.0-0 dependencies: '@babel/core': 7.15.8 - '@babel/helper-function-name': 7.16.0 + '@babel/helper-function-name': 7.15.4 '@babel/helper-plugin-utils': 7.14.5 /@babel/plugin-transform-literals/7.14.5_@babel+core@7.12.9: @@ -1736,7 +1764,7 @@ packages: '@babel/core': ^7.0.0-0 dependencies: '@babel/core': 7.15.8 - '@babel/helper-hoist-variables': 7.16.0 + '@babel/helper-hoist-variables': 7.15.4 '@babel/helper-module-transforms': 7.15.8 '@babel/helper-plugin-utils': 7.14.5 '@babel/helper-validator-identifier': 7.15.7 @@ -1828,7 +1856,7 @@ packages: dependencies: '@babel/core': 7.15.8 '@babel/helper-plugin-utils': 7.14.5 - '@babel/helper-replace-supers': 7.16.0 + '@babel/helper-replace-supers': 7.15.4 transitivePeerDependencies: - supports-color @@ -2276,7 +2304,7 @@ packages: '@babel/helper-plugin-utils': 7.14.5 '@babel/plugin-proposal-unicode-property-regex': 7.14.5_@babel+core@7.15.8 '@babel/plugin-transform-dotall-regex': 7.14.5_@babel+core@7.15.8 - '@babel/types': 7.16.0 + '@babel/types': 7.15.6 esutils: 2.0.3 /@babel/preset-typescript/7.15.0_@babel+core@7.15.8: @@ -2324,8 +2352,8 @@ packages: engines: {node: '>=6.9.0'} dependencies: '@babel/code-frame': 7.16.0 - '@babel/parser': 7.15.8 - '@babel/types': 7.15.6 + '@babel/parser': 7.16.2 + '@babel/types': 7.16.0 /@babel/template/7.16.0: resolution: {integrity: sha512-MnZdpFD/ZdYhXwiunMqqgyZyucaYsbL0IrjoGjaVhGilz+x8YB++kRfygSOIj1yOtWKPlx7NBp+9I1RQSgsd5A==} @@ -2340,12 +2368,12 @@ packages: engines: {node: '>=6.9.0'} dependencies: '@babel/code-frame': 7.16.0 - '@babel/generator': 7.15.8 - '@babel/helper-function-name': 7.15.4 - '@babel/helper-hoist-variables': 7.15.4 - '@babel/helper-split-export-declaration': 7.15.4 - '@babel/parser': 7.15.8 - '@babel/types': 7.15.6 + '@babel/generator': 7.16.0 + '@babel/helper-function-name': 7.16.0 + '@babel/helper-hoist-variables': 7.16.0 + '@babel/helper-split-export-declaration': 7.16.0 + '@babel/parser': 7.16.2 + '@babel/types': 7.16.0 debug: 4.3.2 globals: 11.12.0 transitivePeerDependencies: @@ -5673,10 +5701,10 @@ packages: peerDependencies: eslint: '>= 4.12.1' dependencies: - '@babel/code-frame': 7.16.0 - '@babel/parser': 7.16.2 - '@babel/traverse': 7.16.0 - '@babel/types': 7.16.0 + '@babel/code-frame': 7.15.8 + '@babel/parser': 7.15.8 + '@babel/traverse': 7.15.4 + '@babel/types': 7.15.6 eslint: 7.32.0 eslint-visitor-keys: 1.3.0 resolve: 1.20.0 @@ -6304,7 +6332,7 @@ packages: hasBin: true dependencies: caniuse-lite: 1.0.30001278 - electron-to-chromium: 1.3.861 + electron-to-chromium: 1.3.889 escalade: 3.1.1 node-releases: 1.1.77 picocolors: 0.2.1 @@ -7968,9 +7996,6 @@ packages: jake: 10.8.2 dev: true - /electron-to-chromium/1.3.861: - resolution: {integrity: sha512-GZyflmpMnZRdZ1e2yAyvuFwz1MPSVQelwHX4TJZyXypB8NcxdPvPNwy5lOTxnlkrK13EiQzyTPugRSnj6cBgKg==} - /electron-to-chromium/1.3.889: resolution: {integrity: sha512-suEUoPTD1mExjL9TdmH7cvEiWJVM2oEiAi+Y1p0QKxI2HcRlT44qDTP2c1aZmVwRemIPYOpxmV7CxQCOWcm4XQ==} @@ -8789,7 +8814,7 @@ packages: engines: {node: ^8.10.0 || ^10.13.0 || >=11.10.1} hasBin: true dependencies: - '@babel/code-frame': 7.15.8 + '@babel/code-frame': 7.16.0 ajv: 6.12.6 chalk: 2.4.2 cross-spawn: 6.0.5 @@ -11601,11 +11626,11 @@ packages: resolution: {integrity: sha512-5nnIN4vo5xQZHdXno/YDXJ0G+I3dAm4XgzfSVTPLQpj/zAV2dV6Juy0yaf10/zrJOJeHoN3fraFe+XRq2bFVZA==} engines: {node: '>=6'} dependencies: - '@babel/generator': 7.15.8 - '@babel/parser': 7.15.8 - '@babel/template': 7.15.4 - '@babel/traverse': 7.15.4 - '@babel/types': 7.15.6 + '@babel/generator': 7.16.0 + '@babel/parser': 7.16.2 + '@babel/template': 7.16.0 + '@babel/traverse': 7.16.0 + '@babel/types': 7.16.0 istanbul-lib-coverage: 2.0.5 semver: 6.3.0 transitivePeerDependencies: @@ -12262,7 +12287,7 @@ packages: resolution: {integrity: sha512-Cq7vkAgaYKp+PsX+2/JbTarrk0DmNhsEtqBXNwUHkdlbrTBLtMJINADf2mf5FkowNsq8evbPc07/qFO0AdKTzw==} engines: {node: '>= 6'} dependencies: - '@babel/traverse': 7.15.4 + '@babel/traverse': 7.16.0 '@jest/environment': 24.9.0 '@jest/test-result': 24.9.0 '@jest/types': 24.9.0 @@ -12400,7 +12425,7 @@ packages: resolution: {integrity: sha512-oCj8FiZ3U0hTP4aSui87P4L4jC37BtQwUMqk+zk/b11FR19BJDeZsZAvIHutWnmtw7r85UmR3CEWZ0HWU2mAlw==} engines: {node: '>= 6'} dependencies: - '@babel/code-frame': 7.15.8 + '@babel/code-frame': 7.16.0 '@jest/test-result': 24.9.0 '@jest/types': 24.9.0 '@types/stack-utils': 1.0.1 @@ -12876,7 +12901,7 @@ packages: resolution: {integrity: sha512-uI/rszGSs73xCM0l+up7O7a40o90cnrk429LOiK3aeTvfC0HHmldbd81/B7Ix81KSFe1lwkbl7GnBGG4UfuDew==} engines: {node: '>= 6'} dependencies: - '@babel/types': 7.15.6 + '@babel/types': 7.16.0 '@jest/types': 24.9.0 chalk: 2.4.2 expect: 24.9.0