Fix conflicts

bluehost · Oct 2, 2024 · e5a6f21 · e5a6f21
1 parent c4c9b93
commit e5a6f21
Show file tree

Hide file tree

Showing 4 changed files with 7,966 additions and 5,032 deletions.
diff --git a/composer.json b/composer.json
@@ -33,6 +33,13 @@
       "only": [
         "newfold-labs/*"
       ]
+    },
+    "instawp": {
+      "type": "vcs",
+      "url": "git@github.com:InstaWP/connect-helpers.git",
+      "only": [
+        "instawp/*"
+      ]
     }
   },
   "scripts": {
@@ -44,12 +51,12 @@
     "i18n-pot": "vendor/bin/wp i18n make-pot . ./languages/wp-plugin-bluehost.pot --headers='{\"Report-Msgid-Bugs-To\":\"https://github.com/bluehost/bluehost-wordpress-plugin/issues\",\"POT-Creation-Date\":\"2023-03-08T20:13:41+00:00\"}' --exclude=assets,tests,src",
     "i18n-po": "vendor/bin/wp i18n update-po ./languages/wp-plugin-bluehost.pot ./languages",
     "i18n-mo": "vendor/bin/wp i18n make-mo ./languages",
-    "i18n-json": "vendor/bin/wp i18n make-json ./languages --no-purge --pretty-print",
-    "i18n-json-rename": "for f in ./languages/*.json; do mv \"$f\" \"$(echo \"$f\" | sed 's/[0-9a-fA-F]\\{32\\}/bluehost-script/')\"; done",
+    "i18n-json": "rm -f languages/*.json && vendor/bin/wp i18n make-json ./languages --no-purge --pretty-print",
     "i18n": [
       "@i18n-pot",
       "@i18n-po",
-      "@i18n-mo"
+      "@i18n-mo",
+      "@i18n-json"
     ],
     "lint": "@test",
     "test": "@test-standards",
@@ -74,34 +81,39 @@
   "require-dev": {
     "dealerdirect/phpcodesniffer-composer-installer": "@stable",
     "friendsofphp/php-cs-fixer": "^2.19",
-    "newfold-labs/wp-php-standards": "^1.2",
     "phpcompatibility/phpcompatibility-wp": "@stable",
     "roave/security-advisories": "dev-latest",
     "squizlabs/php_codesniffer": "@stable",
-    "wp-cli/i18n-command": "^2.5.0",
     "wp-coding-standards/wpcs": "^3.0",
-    "wp-phpunit/wp-phpunit": "^6.4.2"
+    "newfold-labs/wp-php-standards": "^1.2.4",
+    "wp-cli/i18n-command": "^2.6.2",
+    "wp-phpunit/wp-phpunit": "^6.6.2"
   },
   "require": {
-    "wp-forge/wp-upgrade-handler": "^1.0",
-    "newfold-labs/wp-module-sso": "^1.0.4",
-    "wp-forge/wp-update-handler": "^1.0.2",
-    "newfold-labs/wp-module-data": "^2.4.20",
-    "newfold-labs/wp-module-context": "^1.0.0",
+    "newfold-labs/wp-module-activation": "^1.0.3",
+    "newfold-labs/wp-module-atomic": "^1.3.0",
+    "newfold-labs/wp-module-coming-soon": "^1.2.6",
+    "newfold-labs/wp-module-context": "^1.0.1",
+    "newfold-labs/wp-module-data": "^2.6.3",
+    "newfold-labs/wp-module-deactivation": "^1.2.3",
+    "newfold-labs/wp-module-ecommerce": "^1.3.44",
+    "newfold-labs/wp-module-facebook": "^1.0.9",
+    "newfold-labs/wp-module-features": "^1.4.2",
+    "newfold-labs/wp-module-global-ctb": "^1.0.13",
+    "newfold-labs/wp-module-help-center": "^2.1.0",
     "newfold-labs/wp-module-loader": "^1.0.10",
-    "newfold-labs/wp-module-runtime": "^1.0.9",
-    "newfold-labs/wp-module-staging": "^1.3.0",
-    "newfold-labs/wp-module-patterns": "^0.1.15",
-    "newfold-labs/wp-module-activation": "^1.0.1",
-    "newfold-labs/wp-module-ecommerce": "^1.3.25",
-    "newfold-labs/wp-module-onboarding": "^2.1.8",
-    "newfold-labs/wp-module-coming-soon": "^1.2.3",
-    "newfold-labs/wp-module-global-ctb": "^1.0.11",
-    "newfold-labs/wp-module-marketplace": "^2.2.4",
-    "newfold-labs/wp-module-performance": "^1.4.0",
-    "newfold-labs/wp-module-deactivation": "^1.1.1",
-    "newfold-labs/wp-module-help-center": "^1.0.24",
-    "newfold-labs/wp-module-notifications": "^1.2.5",
-    "newfold-labs/wp-module-secure-passwords": "^1.1.1"
+    "newfold-labs/wp-module-marketplace": "^2.4.0",
+    "newfold-labs/wp-module-migration": "^1.0.11",
+    "newfold-labs/wp-module-my-products": "^1.0.6",
+    "newfold-labs/wp-module-notifications": "^1.6.0",
+    "newfold-labs/wp-module-onboarding": "^2.4.1",
+    "newfold-labs/wp-module-patterns": "^2.4.1",
+    "newfold-labs/wp-module-performance": "2.0.1 as 1.9.9",
+    "newfold-labs/wp-module-runtime": "^1.0.11",
+    "newfold-labs/wp-module-secure-passwords": "^1.1.1",
+    "newfold-labs/wp-module-sso": "^1.0.6",
+    "newfold-labs/wp-module-staging": "^2.1.1",
+    "wp-forge/wp-update-handler": "^1.0.2",
+    "wp-forge/wp-upgrade-handler": "^1.0"
   }
 }