Merge branch 'trunk' into develop

Author: Paul Dechov

changelog.txt

@@ -1,8 +1,9 @@
 *** Changelog ***
 
-= 6.3.0 - 2022-xx-xx =
-* Tweak - Remove html from translatable strings
+= 6.3.0 - 2022-03-10 =
+* Tweak - Remove html from translatable strings.
 * Tweak - Revert the deprecation of the 'wc_stripe_hide_payment_request_on_product_page', 'wc_stripe_show_payment_request_on_checkout', and 'wc_stripe_show_payment_request_on_cart' filters.
+* Tweak - Address minor styling issues in settings.
 
 = 6.2.0 - 2022-02-17 =
 * Add - Add onboarding payment gateway setup methods.

package-lock.json

@@ -1,7 +1,7 @@
 {
   "name": "woocommerce-gateway-stripe",
   "title": "WooCommerce Gateway Stripe",
-  "version": "6.2.0",
+  "version": "6.3.0",
   "license": "GPL-3.0",
   "homepage": "http://wordpress.org/plugins/woocommerce-gateway-stripe/",
   "repository": {
@@ -116,18 +116,18 @@
     "i18n:merge": "php bin/update-pot-file-references.php languages/woocommerce-gateway-stripe.pot",
     "start": "npm run start:webpack",
     "start:webpack": "rimraf build/* && wp-scripts start",
-    "preuglify": "rm -f $npm_package_assets_js_min",
-    "uglify": "for f in $npm_package_assets_js_js; do file=${f%.js}; node_modules/.bin/uglifyjs $f -c -m > $file.min.js; done",
+    "preuglify": "rm -f $npm_package_config_assets_js_min",
+    "uglify": "for f in $npm_package_config_assets_js_js; do file=${f%.js}; node_modules/.bin/uglifyjs $f -c -m > $file.min.js; done",
     "up": "docker-compose up --build --force-recreate -d && ./bin/docker-setup.sh",
     "down": "docker-compose down",
     "xdebug:start": "docker-compose exec wordpress sh -c 'sed -i \"/xdebug.mode=off/c\\xdebug.mode=debug\" /usr/local/etc/php/php.ini && /etc/init.d/apache2 reload'",
     "xdebug:stop": "docker-compose exec wordpress sh -c 'sed -i \"/xdebug.mode=debug/c\\xdebug.mode=off\" /usr/local/etc/php/php.ini && /etc/init.d/apache2 reload'",
     "wp": "docker run -it --env-file default.env --rm --user xfs --volumes-from woocommerce_stripe_wordpress --network container:woocommerce_stripe_wordpress wordpress:cli",
     "listen": "stripe listen --forward-to 'http://localhost:8082/?wc-api=wc_stripe'",
-    "presass": "rm -f $npm_package_assets_styles_css",
-    "sass": "node_modules/.bin/node-sass $npm_package_assets_styles_cssfolder --output $npm_package_assets_styles_cssfolder --output-style compressed",
-    "watchsass": "node_modules/.bin/node-sass $npm_package_assets_styles_sass --output $npm_package_assets_styles_cssfolder --output-style compressed --watch",
-    "postsass": "for f in $npm_package_assets_styles_css; do file=${f%.css}; node_modules/.bin/cleancss -o $file.css $f; done",
+    "presass": "rm -f $npm_package_config_assets_styles_css",
+    "sass": "node_modules/.bin/node-sass $npm_package_config_assets_styles_cssfolder --output $npm_package_config_assets_styles_cssfolder --output-style compressed",
+    "watchsass": "node_modules/.bin/node-sass $npm_package_config_assets_styles_sass --output $npm_package_config_assets_styles_cssfolder --output-style compressed --watch",
+    "postsass": "for f in $npm_package_config_assets_styles_css; do file=${f%.css}; node_modules/.bin/cleancss -o $file.css $f; done",
     "test": "cross-env NODE_CONFIG_DIR='./tests/e2e/config' BABEL_ENV=commonjs mocha \"tests/e2e\" --require babel-register --recursive",
     "test:grep": "cross-env NODE_CONFIG_DIR='./tests/e2e/config' BABEL_ENV=commonjs mocha \"tests/e2e\" --require babel-register --grep ",
     "test:single": "cross-env NODE_CONFIG_DIR='./tests/e2e/config' BABEL_ENV=commonjs mocha --require babel-register",
@@ -159,6 +159,17 @@
       "includes",
       "templates",
       "woocommerce-gateway-stripe.php"
-    ]
+    ],
+    "assets": {
+      "js": {
+        "min": "assets/js/*.min.js",
+        "js": "assets/js/*.js"
+      },
+      "styles": {
+        "css": "assets/css/*.css",
+        "sass": "assets/css/*.scss",
+        "cssfolder": "assets/css/"
+      }
+    }
   }
 }

package.json

@@ -4,7 +4,7 @@ Tags: credit card, stripe, apple pay, payment request, google pay, sepa, sofort,
 Requires at least: 5.6
 Tested up to: 5.9
 Requires PHP: 7.0
-Stable tag: 6.2.0
+Stable tag: 6.3.0
 License: GPLv3
 License URI: https://www.gnu.org/licenses/gpl-3.0.html
 Attributions: thorsten-stripe
@@ -128,7 +128,9 @@ If you get stuck, you can ask for help in the Plugin Forum.
 
 == Changelog ==
 
-= 6.3.0 - 2022-xx-xx =
+= 6.3.0 - 2022-03-10 =
+* Tweak - Remove html from translatable strings.
 * Tweak - Revert the deprecation of the 'wc_stripe_hide_payment_request_on_product_page', 'wc_stripe_show_payment_request_on_checkout', and 'wc_stripe_show_payment_request_on_cart' filters.
+* Tweak - Address minor styling issues in settings.
 
 [See changelog for all versions](https://raw.githubusercontent.com/woocommerce/woocommerce-gateway-stripe/trunk/changelog.txt).

readme.txt

@@ -5,7 +5,7 @@
  * Description: Take credit card payments on your store using Stripe.
  * Author: WooCommerce
  * Author URI: https://woocommerce.com/
- * Version: 6.2.0
+ * Version: 6.3.0
  * Requires at least: 5.6
  * Tested up to: 5.9
  * WC requires at least: 5.7
@@ -21,7 +21,7 @@
 /**
  * Required minimums and constants
  */
-define( 'WC_STRIPE_VERSION', '6.2.0' ); // WRCS: DEFINED_VERSION.
+define( 'WC_STRIPE_VERSION', '6.3.0' ); // WRCS: DEFINED_VERSION.
 define( 'WC_STRIPE_MIN_PHP_VER', '7.0.0' );
 define( 'WC_STRIPE_MIN_WC_VER', '5.7' );
 define( 'WC_STRIPE_FUTURE_MIN_WC_VER', '5.8' );