diff --git a/.gitignore b/.gitignore index c4ade6a2279e6..6c4ba978f3506 100644 --- a/.gitignore +++ b/.gitignore @@ -12,7 +12,7 @@ project.properties .sublimelinterrc # Grunt -/node_modules/ +node_modules/ none # Sass @@ -46,7 +46,6 @@ tests/cli/vendor /tests/e2e/config/local.json /tests/e2e/docker /tests/e2e/env/docker/wp-cli/initialize.sh -/tests/e2e/env/node_modules/ /tests/e2e/env/build/ /tests/e2e/env/build-module/ diff --git a/package-lock.json b/package-lock.json index 106e4b29f6636..50fd94e8c8a33 100644 --- a/package-lock.json +++ b/package-lock.json @@ -7251,7 +7251,7 @@ "version": "file:tests/e2e/env", "dev": true, "requires": { - "@wordpress/e2e-test-utils": "^4.3.0", + "@wordpress/e2e-test-utils": "^4.6.0", "@wordpress/jest-preset-default": "^5.4.0", "app-root-path": "^3.0.0", "jest": "^25.1.0", @@ -7358,36 +7358,93 @@ "dev": true }, "@wordpress/e2e-test-utils": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/@wordpress/e2e-test-utils/-/e2e-test-utils-4.3.1.tgz", - "integrity": "sha512-5/JWB68PaXH8eYLwMc1CfmJcAwSIySuBBJA6KyizV+kXRh45KNqkqRO6XluhUsgzDP5WhrBvF8XmATDpmntptw==", + "version": "4.6.0", + "resolved": "https://registry.npmjs.org/@wordpress/e2e-test-utils/-/e2e-test-utils-4.6.0.tgz", + "integrity": "sha512-oqnFEOuWkUFwzSVGeKZOfs9YhWVyCKdsOtJKnXd6Vv5Q1quq2fmbDp6HL+dIUI2DlJZISUmOWG4B37mMVA0DLg==", "dev": true, "requires": { - "@babel/runtime": "^7.8.3", - "@wordpress/keycodes": "^2.9.0", - "@wordpress/url": "^2.11.0", + "@babel/runtime": "^7.9.2", + "@wordpress/keycodes": "^2.12.0", + "@wordpress/url": "^2.14.0", "lodash": "^4.17.15", "node-fetch": "^1.7.3" }, "dependencies": { "@babel/runtime": { - "version": "7.9.2", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.9.2.tgz", - "integrity": "sha512-NE2DtOdufG7R5vnfQUTehdTfNycfUANEtCa9PssN9O/xmTzP4E08UI797ixaei6hBEVL9BI/PsdJS5x7mWoB9Q==", + "version": "7.9.6", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.9.6.tgz", + "integrity": "sha512-64AF1xY3OAkFHqOb9s4jpgk1Mm5vDZ4L3acHvAml+53nO1XbXLuDodsVpO4OIUsmemlUHMxNdYMNJmsvOwLrvQ==", "dev": true, "requires": { "regenerator-runtime": "^0.13.4" } }, + "@tannin/compile": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@tannin/compile/-/compile-1.1.0.tgz", + "integrity": "sha512-n8m9eNDfoNZoxdvWiTfW/hSPhehzLJ3zW7f8E7oT6mCROoMNWCB4TYtv041+2FMAxweiE0j7i1jubQU4MEC/Gg==", + "dev": true, + "requires": { + "@tannin/evaluate": "^1.2.0", + "@tannin/postfix": "^1.1.0" + } + }, + "@tannin/evaluate": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/@tannin/evaluate/-/evaluate-1.2.0.tgz", + "integrity": "sha512-3ioXvNowbO/wSrxsDG5DKIMxC81P0QrQTYai8zFNY+umuoHWRPbQ/TuuDEOju9E+jQDXmj6yI5GyejNuh8I+eg==", + "dev": true + }, + "@tannin/plural-forms": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@tannin/plural-forms/-/plural-forms-1.1.0.tgz", + "integrity": "sha512-xl9R2mDZO/qiHam1AgMnAES6IKIg7OBhcXqy6eDsRCdXuxAFPcjrej9HMjyCLE0DJ/8cHf0i5OQTstuBRhpbHw==", + "dev": true, + "requires": { + "@tannin/compile": "^1.1.0" + } + }, + "@tannin/postfix": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@tannin/postfix/-/postfix-1.1.0.tgz", + "integrity": "sha512-oocsqY7g0cR+Gur5jRQLSrX2OtpMLMse1I10JQBm8CdGMrDkh1Mg2gjsiquMHRtBs4Qwu5wgEp5GgIYHk4SNPw==", + "dev": true + }, + "@wordpress/i18n": { + "version": "3.12.0", + "resolved": "https://registry.npmjs.org/@wordpress/i18n/-/i18n-3.12.0.tgz", + "integrity": "sha512-QkdHd2Z2yTFItBnnzzjMW4IXJlofWMivct4BkgwRivrG7kLxE7nd2xMG3+hFkkdYGdzE67u8vmin0gmQ+14yPA==", + "dev": true, + "requires": { + "@babel/runtime": "^7.9.2", + "gettext-parser": "^1.3.1", + "lodash": "^4.17.15", + "memize": "^1.1.0", + "sprintf-js": "^1.1.1", + "tannin": "^1.2.0" + } + }, + "@wordpress/keycodes": { + "version": "2.12.0", + "resolved": "https://registry.npmjs.org/@wordpress/keycodes/-/keycodes-2.12.0.tgz", + "integrity": "sha512-7fUwfquRLmE4CvJahZTHdNn31heoDcyZ4acgEQR4iKYsKjX6dF1coZjUe693xbf/4r8GmsOg0/uYDImMdDm+1Q==", + "dev": true, + "requires": { + "@babel/runtime": "^7.9.2", + "@wordpress/i18n": "^3.12.0", + "lodash": "^4.17.15" + } + }, "@wordpress/url": { - "version": "2.11.0", - "resolved": "https://registry.npmjs.org/@wordpress/url/-/url-2.11.0.tgz", - "integrity": "sha512-x7vac1Up64lxX7j69f1OYMcC61gADnz4iFYocJCPPioPjkp3OX1sTPIwBOARw/T/EzwRLSFJsyfEcxr7hJhCSw==", + "version": "2.14.0", + "resolved": "https://registry.npmjs.org/@wordpress/url/-/url-2.14.0.tgz", + "integrity": "sha512-TSp6vDpmBTiYTwhlc5mleT4g3mOsw2w5bu5AcqiX344o48rju+ktuTZBQofNIhl3m04zYtl6YR14M1dsXKTsNQ==", "dev": true, "requires": { - "@babel/runtime": "^7.8.3", + "@babel/runtime": "^7.9.2", "lodash": "^4.17.15", - "qs": "^6.5.2" + "qs": "^6.5.2", + "react-native-url-polyfill": "^1.1.2" } }, "lodash": { @@ -7396,11 +7453,26 @@ "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==", "dev": true }, + "memize": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/memize/-/memize-1.1.0.tgz", + "integrity": "sha512-K4FcPETOMTwe7KL2LK0orMhpOmWD2wRGwWWpbZy0fyArwsyIKR8YJVz8+efBAh3BO4zPqlSICu4vsLTRRqtFAg==", + "dev": true + }, "regenerator-runtime": { "version": "0.13.5", "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.5.tgz", "integrity": "sha512-ZS5w8CpKFinUzOwW3c83oPeVXoNsrLsaCoLtJvAClH135j/R77RuymhiSErhm2lKcwSCIpmvIWSbDkIfAqKQlA==", "dev": true + }, + "tannin": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/tannin/-/tannin-1.2.0.tgz", + "integrity": "sha512-U7GgX/RcSeUETbV7gYgoz8PD7Ni4y95pgIP/Z6ayI3CfhSujwKEBlGFTCRN+Aqnuyf4AN2yHL+L8x+TCGjb9uA==", + "dev": true, + "requires": { + "@tannin/plural-forms": "^1.1.0" + } } } }, diff --git a/package.json b/package.json index 6bdaddab5cc00..700a76398bb30 100644 --- a/package.json +++ b/package.json @@ -33,7 +33,7 @@ "@woocommerce/e2e-environment": "file:tests/e2e/env", "@wordpress/babel-plugin-import-jsx-pragma": "1.1.3", "@wordpress/babel-preset-default": "3.0.2", - "@wordpress/e2e-test-utils": "4.3.1", + "@wordpress/e2e-test-utils": "4.6.0", "autoprefixer": "9.7.5", "babel-eslint": "10.1.0", "chai": "4.2.0", diff --git a/tests/e2e/env/package.json b/tests/e2e/env/package.json index 528ba3f831dcd..492f04ac462b8 100644 --- a/tests/e2e/env/package.json +++ b/tests/e2e/env/package.json @@ -19,8 +19,9 @@ "url": "https://github.com/woocommerce/woocommerce/issues" }, "main": "index.js", + "module": "build-module/index.js", "dependencies": { - "@wordpress/e2e-test-utils": "^4.3.0", + "@wordpress/e2e-test-utils": "^4.6.0", "@wordpress/jest-preset-default": "^5.4.0", "app-root-path": "^3.0.0", "jest": "^25.1.0", @@ -46,7 +47,6 @@ "docker:ssh": "docker exec -it woocommerce_wordpress-www /bin/bash", "install-wp-tests": "./bin/install-wp-tests.sh", "test:e2e": "bash ./bin/wait-for-build.sh && ./bin/e2e-test-integration.js", - "test:e2e-CI": "bash ./bin/e2e-CI.sh", "test:e2e-dev": "bash ./bin/wait-for-build.sh && ./bin/e2e-test-integration.js --dev" } }