From 2cbb2ea861b7e739f334d11d9f4c9d9fec468d2c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 3 Dec 2024 15:39:05 +0000 Subject: [PATCH 01/12] NPM(deps): Bump react-router-dom from 6.28.0 to 7.0.2 Bumps [react-router-dom](https://github.com/remix-run/react-router/tree/HEAD/packages/react-router-dom) from 6.28.0 to 7.0.2. - [Release notes](https://github.com/remix-run/react-router/releases) - [Changelog](https://github.com/remix-run/react-router/blob/main/packages/react-router-dom/CHANGELOG.md) - [Commits](https://github.com/remix-run/react-router/commits/react-router-dom@7.0.2/packages/react-router-dom) --- updated-dependencies: - dependency-name: react-router-dom dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- package-lock.json | 69 +++++++++++++++++++++++++++++++---------------- package.json | 2 +- 2 files changed, 47 insertions(+), 24 deletions(-) diff --git a/package-lock.json b/package-lock.json index 02afe45cf..4e678fa36 100644 --- a/package-lock.json +++ b/package-lock.json @@ -27,7 +27,7 @@ "lodash": "^4.17.21", "react": "^18.2.0", "react-error-boundary": "^4.1.2", - "react-router-dom": "^6.28.0", + "react-router-dom": "^7.0.2", "react-use": "^17.5.1", "semver": "^7.6.3" }, @@ -4189,14 +4189,6 @@ } } }, - "node_modules/@remix-run/router": { - "version": "1.21.0", - "resolved": "https://registry.npmjs.org/@remix-run/router/-/router-1.21.0.tgz", - "integrity": "sha512-xfSkCAchbdG5PnbrKqFWwia4Bi61nH+wm8wLEqfHDyp7Y3dZzgqS2itV8i4gAq9pC2HsTpwyBC6Ds8VHZ96JlA==", - "engines": { - "node": ">=14.0.0" - } - }, "node_modules/@rtsao/scc": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/@rtsao/scc/-/scc-1.1.0.tgz", @@ -5015,6 +5007,11 @@ "@types/node": "*" } }, + "node_modules/@types/cookie": { + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/@types/cookie/-/cookie-0.6.0.tgz", + "integrity": "sha512-4Kh9a6B2bQciAhf7FSuMRRkUWecJgJu9nPnx3yzpsfXX/c50REIqpHY4C82bXP90qrLtXtkDxTZosYO3UpOwlA==" + }, "node_modules/@types/estree": { "version": "1.0.6", "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.6.tgz", @@ -20745,33 +20742,49 @@ } }, "node_modules/react-router": { - "version": "6.28.0", - "resolved": "https://registry.npmjs.org/react-router/-/react-router-6.28.0.tgz", - "integrity": "sha512-HrYdIFqdrnhDw0PqG/AKjAqEqM7AvxCz0DQ4h2W8k6nqmc5uRBYDag0SBxx9iYz5G8gnuNVLzUe13wl9eAsXXg==", + "version": "7.0.2", + "resolved": "https://registry.npmjs.org/react-router/-/react-router-7.0.2.tgz", + "integrity": "sha512-m5AcPfTRUcjwmhBzOJGEl6Y7+Crqyju0+TgTQxoS4SO+BkWbhOrcfZNq6wSWdl2BBbJbsAoBUb8ZacOFT+/JlA==", "dependencies": { - "@remix-run/router": "1.21.0" + "@types/cookie": "^0.6.0", + "cookie": "^1.0.1", + "set-cookie-parser": "^2.6.0", + "turbo-stream": "2.4.0" }, "engines": { - "node": ">=14.0.0" + "node": ">=20.0.0" }, "peerDependencies": { - "react": ">=16.8" + "react": ">=18", + "react-dom": ">=18" + }, + "peerDependenciesMeta": { + "react-dom": { + "optional": true + } } }, "node_modules/react-router-dom": { - "version": "6.28.0", - "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.28.0.tgz", - "integrity": "sha512-kQ7Unsl5YdyOltsPGl31zOjLrDv+m2VcIEcIHqYYD3Lp0UppLjrzcfJqDJwXxFw3TH/yvapbnUvPlAj7Kx5nbg==", + "version": "7.0.2", + "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-7.0.2.tgz", + "integrity": "sha512-VJOQ+CDWFDGaWdrG12Nl+d7yHtLaurNgAQZVgaIy7/Xd+DojgmYLosFfZdGz1wpxmjJIAkAMVTKWcvkx1oggAw==", "dependencies": { - "@remix-run/router": "1.21.0", - "react-router": "6.28.0" + "react-router": "7.0.2" }, "engines": { - "node": ">=14.0.0" + "node": ">=20.0.0" }, "peerDependencies": { - "react": ">=16.8", - "react-dom": ">=16.8" + "react": ">=18", + "react-dom": ">=18" + } + }, + "node_modules/react-router/node_modules/cookie": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/cookie/-/cookie-1.0.2.tgz", + "integrity": "sha512-9Kr/j4O16ISv8zBBhJoi4bXOYNTkFLOqSL3UDB0njXxCXNezjeyVrJyGOWtgfs/q2km1gwBcfH8q1yEGoMYunA==", + "engines": { + "node": ">=18" } }, "node_modules/react-side-effect": { @@ -21933,6 +21946,11 @@ "node": ">= 0.8.0" } }, + "node_modules/set-cookie-parser": { + "version": "2.7.1", + "resolved": "https://registry.npmjs.org/set-cookie-parser/-/set-cookie-parser-2.7.1.tgz", + "integrity": "sha512-IOc8uWeOZgnb3ptbCURJWNjWUPcO3ZnTTdzsurqERrP6nPyv+paC55vJM0LpOlT2ne+Ix+9+CRG1MNLlyZ4GjQ==" + }, "node_modules/set-function-length": { "version": "1.2.2", "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz", @@ -24153,6 +24171,11 @@ "node": "*" } }, + "node_modules/turbo-stream": { + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/turbo-stream/-/turbo-stream-2.4.0.tgz", + "integrity": "sha512-FHncC10WpBd2eOmGwpmQsWLDoK4cqsA/UT/GqNoaKOQnT8uzhtCbg3EoUDMvqpOSAI0S26mr0rkjzbOO6S3v1g==" + }, "node_modules/tweetnacl": { "version": "0.14.5", "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz", diff --git a/package.json b/package.json index eb8d10921..08affdaa5 100644 --- a/package.json +++ b/package.json @@ -50,7 +50,7 @@ "lodash": "^4.17.21", "react": "^18.2.0", "react-error-boundary": "^4.1.2", - "react-router-dom": "^6.28.0", + "react-router-dom": "^7.0.2", "react-use": "^17.5.1", "semver": "^7.6.3" }, From 334e5829c6a0bf36919a5e26d18a4db25eff5c63 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 3 Dec 2024 15:39:45 +0000 Subject: [PATCH 02/12] NPM(deps): Bump @wordpress/i18n from 5.12.0 to 5.13.0 Bumps [@wordpress/i18n](https://github.com/WordPress/gutenberg/tree/HEAD/packages/i18n) from 5.12.0 to 5.13.0. - [Release notes](https://github.com/WordPress/gutenberg/releases) - [Changelog](https://github.com/WordPress/gutenberg/blob/trunk/packages/i18n/CHANGELOG.md) - [Commits](https://github.com/WordPress/gutenberg/commits/@wordpress/i18n@5.13.0/packages/i18n) --- updated-dependencies: - dependency-name: "@wordpress/i18n" dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index 02afe45cf..936813390 100644 --- a/package-lock.json +++ b/package-lock.json @@ -19,7 +19,7 @@ "@wordpress/dom-ready": "^4.13.0", "@wordpress/element": "^6.13.0", "@wordpress/html-entities": "^4.13.0", - "@wordpress/i18n": "^5.12.0", + "@wordpress/i18n": "^5.13.0", "@wordpress/icons": "^10.13.0", "ajv": "^8.17.1", "classnames": "^2.5.1", @@ -6751,9 +6751,9 @@ } }, "node_modules/@wordpress/i18n": { - "version": "5.12.0", - "resolved": "https://registry.npmjs.org/@wordpress/i18n/-/i18n-5.12.0.tgz", - "integrity": "sha512-+fAhdRqbTmzTUe46VVMfpFbDJCV1/prB7TccPvUCYf84kM5yLkMa2oqkEwniD7gB97HK1tH9bVD+jJDZL22l9A==", + "version": "5.13.0", + "resolved": "https://registry.npmjs.org/@wordpress/i18n/-/i18n-5.13.0.tgz", + "integrity": "sha512-Ij5y+buxIm1CgGIR3upUp86L9ovE5usWKmMbK5uqa5c40ewL4/ERZlP6UKpHy5INBcXKNk4pSBAH3PLb14wg8g==", "dependencies": { "@babel/runtime": "7.25.7", "@wordpress/hooks": "*", diff --git a/package.json b/package.json index eb8d10921..75466f588 100644 --- a/package.json +++ b/package.json @@ -42,7 +42,7 @@ "@wordpress/dom-ready": "^4.13.0", "@wordpress/element": "^6.13.0", "@wordpress/html-entities": "^4.13.0", - "@wordpress/i18n": "^5.12.0", + "@wordpress/i18n": "^5.13.0", "@wordpress/icons": "^10.13.0", "ajv": "^8.17.1", "classnames": "^2.5.1", From b042d20b8262db541e52b8ab193294a7a9010e5c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 4 Dec 2024 15:18:13 +0000 Subject: [PATCH 03/12] NPM Dev(deps-dev): Bump tailwindcss from 3.4.15 to 3.4.16 Bumps [tailwindcss](https://github.com/tailwindlabs/tailwindcss) from 3.4.15 to 3.4.16. - [Release notes](https://github.com/tailwindlabs/tailwindcss/releases) - [Changelog](https://github.com/tailwindlabs/tailwindcss/blob/v3.4.16/CHANGELOG.md) - [Commits](https://github.com/tailwindlabs/tailwindcss/compare/v3.4.15...v3.4.16) --- updated-dependencies: - dependency-name: tailwindcss dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- package-lock.json | 27 ++++++++------------------- package.json | 2 +- 2 files changed, 9 insertions(+), 20 deletions(-) diff --git a/package-lock.json b/package-lock.json index 02afe45cf..6e00c598f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -42,7 +42,7 @@ "eslint-import-resolver-alias": "^1.1.2", "eslint-plugin-import": "^2.29.1", "node-fetch": "^2.7.0", - "tailwindcss": "^3.4.15" + "tailwindcss": "^3.4.16" }, "engines": { "node": ">=20", @@ -17015,11 +17015,10 @@ } }, "node_modules/lilconfig": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-3.1.2.tgz", - "integrity": "sha512-eop+wDAvpItUys0FWkHIKeC9ybYrTGbU41U5K7+bttZZeohvnY7M9dZ5kB21GNWiFT2q1OoPTvncPCgSOVO5ow==", + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-3.1.3.tgz", + "integrity": "sha512-/vlFKAoH5Cgt3Ie+JLhRbwOsCQePABiU3tJ1egGvyQ+33R/vcwM2Zl2QR/LzjsBeItPt3oSVXapn+m4nQDvpzw==", "dev": true, - "license": "MIT", "engines": { "node": ">=14" }, @@ -23434,9 +23433,9 @@ } }, "node_modules/tailwindcss": { - "version": "3.4.15", - "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.4.15.tgz", - "integrity": "sha512-r4MeXnfBmSOuKUWmXe6h2CcyfzJCEk4F0pptO5jlnYSIViUkVmsawj80N5h2lO3gwcmSb4n3PuN+e+GC1Guylw==", + "version": "3.4.16", + "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.4.16.tgz", + "integrity": "sha512-TI4Cyx7gDiZ6r44ewaJmt0o6BrMCT5aK5e0rmJ/G9Xq3w7CX/5VXl/zIPEJZFUK5VEqwByyhqNPycPlvcK4ZNw==", "dev": true, "dependencies": { "@alloc/quick-lru": "^5.2.0", @@ -23448,7 +23447,7 @@ "glob-parent": "^6.0.2", "is-glob": "^4.0.3", "jiti": "^1.21.6", - "lilconfig": "^2.1.0", + "lilconfig": "^3.1.3", "micromatch": "^4.0.8", "normalize-path": "^3.0.0", "object-hash": "^3.0.0", @@ -23508,16 +23507,6 @@ "node": ">= 6" } }, - "node_modules/tailwindcss/node_modules/lilconfig": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-2.1.0.tgz", - "integrity": "sha512-utWOt/GHzuUxnLKxB6dk81RoOeoNeHgbrXiuGk4yyF5qlRz+iIVWu56E2fqGHFrXz0QNUhLB/8nKqvRH66JKGQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=10" - } - }, "node_modules/tailwindcss/node_modules/readdirp": { "version": "3.6.0", "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz", diff --git a/package.json b/package.json index eb8d10921..3c796184a 100644 --- a/package.json +++ b/package.json @@ -65,7 +65,7 @@ "eslint-import-resolver-alias": "^1.1.2", "eslint-plugin-import": "^2.29.1", "node-fetch": "^2.7.0", - "tailwindcss": "^3.4.15" + "tailwindcss": "^3.4.16" }, "scripts": { "build": "NODE_ENV=production wp-scripts build", From 7e0d46b8d7ed694da744342201bb6214704a73c3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 4 Dec 2024 21:57:32 +0000 Subject: [PATCH 04/12] NPM(deps): Bump @heroicons/react from 2.1.5 to 2.2.0 Bumps [@heroicons/react](https://github.com/tailwindlabs/heroicons) from 2.1.5 to 2.2.0. - [Release notes](https://github.com/tailwindlabs/heroicons/releases) - [Changelog](https://github.com/tailwindlabs/heroicons/blob/master/CHANGELOG.md) - [Commits](https://github.com/tailwindlabs/heroicons/compare/v2.1.5...v2.2.0) --- updated-dependencies: - dependency-name: "@heroicons/react" dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- package-lock.json | 19 +++++++++++++------ package.json | 2 +- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/package-lock.json b/package-lock.json index ca89c3218..981eb402e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,7 +9,7 @@ "version": "3.15.6", "license": "GPL-2.0-or-later", "dependencies": { - "@heroicons/react": "^2.1.5", + "@heroicons/react": "^2.2.0", "@newfold-labs/wp-module-ecommerce": "^1.4.4", "@newfold-labs/wp-module-facebook": "^1.0.9", "@newfold-labs/wp-module-runtime": "^1.0.12", @@ -2803,12 +2803,11 @@ } }, "node_modules/@heroicons/react": { - "version": "2.1.5", - "resolved": "https://registry.npmjs.org/@heroicons/react/-/react-2.1.5.tgz", - "integrity": "sha512-FuzFN+BsHa+7OxbvAERtgBTNeZpUjgM/MIizfVkSCL2/edriN0Hx/DWRCR//aPYwO5QX/YlgLGXk+E3PcfZwjA==", - "license": "MIT", + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/@heroicons/react/-/react-2.2.0.tgz", + "integrity": "sha512-LMcepvRaS9LYHJGsF0zzmgKCUim/X3N/DQKc4jepAXJ7l8QxJ1PmxJzqplF2Z3FE4PqBAIGyJAQ/w4B5dsqbtQ==", "peerDependencies": { - "react": ">= 16" + "react": ">= 16 || ^19.0.0-rc" } }, "node_modules/@humanwhocodes/config-array": { @@ -3471,6 +3470,14 @@ "swr": "2.2.5" } }, + "node_modules/@newfold-labs/wp-module-ecommerce/node_modules/@heroicons/react": { + "version": "2.1.5", + "resolved": "https://registry.npmjs.org/@heroicons/react/-/react-2.1.5.tgz", + "integrity": "sha512-FuzFN+BsHa+7OxbvAERtgBTNeZpUjgM/MIizfVkSCL2/edriN0Hx/DWRCR//aPYwO5QX/YlgLGXk+E3PcfZwjA==", + "peerDependencies": { + "react": ">= 16" + } + }, "node_modules/@newfold-labs/wp-module-ecommerce/node_modules/@reduxjs/toolkit": { "version": "2.2.7", "resolved": "https://registry.npmjs.org/@reduxjs/toolkit/-/toolkit-2.2.7.tgz", diff --git a/package.json b/package.json index 7053089bc..d03abd14b 100644 --- a/package.json +++ b/package.json @@ -32,7 +32,7 @@ "npm": ">=10" }, "dependencies": { - "@heroicons/react": "^2.1.5", + "@heroicons/react": "^2.2.0", "@newfold-labs/wp-module-ecommerce": "^1.4.4", "@newfold-labs/wp-module-facebook": "^1.0.9", "@newfold-labs/wp-module-runtime": "^1.0.12", From 142b86c8148e3a41ece01983d0ae084d261ddbb5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 5 Dec 2024 15:38:38 +0000 Subject: [PATCH 05/12] NPM Dev(deps-dev): Bump cypress from 13.16.0 to 13.16.1 Bumps [cypress](https://github.com/cypress-io/cypress) from 13.16.0 to 13.16.1. - [Release notes](https://github.com/cypress-io/cypress/releases) - [Changelog](https://github.com/cypress-io/cypress/blob/develop/CHANGELOG.md) - [Commits](https://github.com/cypress-io/cypress/compare/v13.16.0...v13.16.1) --- updated-dependencies: - dependency-name: cypress dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index e079eecc0..0f27186f7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -37,7 +37,7 @@ "@wordpress/env": "^10.13.0", "@wordpress/eslint-plugin": "^21.6.0", "@wordpress/scripts": "^30.6.0", - "cypress": "^13.16.0", + "cypress": "^13.16.1", "cypress-axe": "^1.5.0", "eslint-import-resolver-alias": "^1.1.2", "eslint-plugin-import": "^2.29.1", @@ -9894,9 +9894,9 @@ } }, "node_modules/cypress": { - "version": "13.16.0", - "resolved": "https://registry.npmjs.org/cypress/-/cypress-13.16.0.tgz", - "integrity": "sha512-g6XcwqnvzXrqiBQR/5gN+QsyRmKRhls1y5E42fyOvsmU7JuY+wM6uHJWj4ZPttjabzbnRvxcik2WemR8+xT6FA==", + "version": "13.16.1", + "resolved": "https://registry.npmjs.org/cypress/-/cypress-13.16.1.tgz", + "integrity": "sha512-17FtCaz0cx7ssWYKXzGB0Vub8xHwpVPr+iPt2fHhLMDhVAPVrplD+rTQsZUsfb19LVBn5iwkEUFjQ1yVVJXsLA==", "dev": true, "hasInstallScript": true, "dependencies": { diff --git a/package.json b/package.json index ae4bb7bfa..700d86b20 100644 --- a/package.json +++ b/package.json @@ -60,7 +60,7 @@ "@wordpress/env": "^10.13.0", "@wordpress/eslint-plugin": "^21.6.0", "@wordpress/scripts": "^30.6.0", - "cypress": "^13.16.0", + "cypress": "^13.16.1", "cypress-axe": "^1.5.0", "eslint-import-resolver-alias": "^1.1.2", "eslint-plugin-import": "^2.29.1", From 4a38a9bc35272412d87ac88f81eea3dec14cfff3 Mon Sep 17 00:00:00 2001 From: Evan Mullins Date: Thu, 5 Dec 2024 13:20:03 -0500 Subject: [PATCH 06/12] update package.json version with a script --- package.json | 1 + set-version-bump.js | 17 +++++++++++++++++ 2 files changed, 18 insertions(+) create mode 100644 set-version-bump.js diff --git a/package.json b/package.json index 7053089bc..066c25b81 100644 --- a/package.json +++ b/package.json @@ -88,6 +88,7 @@ "postprepare": "npm run set-wp-version", "prebuild:cleanup": "rm -rf ./build ./bluehost-wordpress-plugin ./bluehost-wordpress-plugin.zip ./vendor", "set-wp-version": "node ./set-latest-wp-version.js", + "set-version-bump": "node ./set-version-bump.js", "simulate-runner-build": "npm run prebuild:cleanup && npm i --legacy-peer-deps && npm run php-deps && npm run build && npm run create:dist && npm run create:zip", "srb": "npm run simulate-runner-build", "start": "NODE_ENV=develop wp-scripts start", diff --git a/set-version-bump.js b/set-version-bump.js new file mode 100644 index 000000000..049d45574 --- /dev/null +++ b/set-version-bump.js @@ -0,0 +1,17 @@ +let fs = require('fs'); +let semver = require('semver'); + +if (fs.existsSync('./package.json')) { + var package = require('./package.json'); + let currentVersion = package.version; + let type = process.argv[2]; + if (!['major', 'minor', 'patch'].includes(type)) { + type = 'patch'; + } + + let newVersion = semver.inc(package.version, type); + package.version = newVersion; + fs.writeFileSync('./package.json', JSON.stringify(package, null, 2)); + + console.log('Version updated', currentVersion, '=>', newVersion); +} \ No newline at end of file From f3a696d46e133f168a04d4713ae71f37ea9e5259 Mon Sep 17 00:00:00 2001 From: Evan Mullins Date: Thu, 5 Dec 2024 13:37:43 -0500 Subject: [PATCH 07/12] update plugin file in version bump script too --- set-version-bump.js | 43 +++++++++++++++++++++++++++++-------------- 1 file changed, 29 insertions(+), 14 deletions(-) diff --git a/set-version-bump.js b/set-version-bump.js index 049d45574..bd3c0b94c 100644 --- a/set-version-bump.js +++ b/set-version-bump.js @@ -1,17 +1,32 @@ -let fs = require('fs'); -let semver = require('semver'); +const fs = require( 'fs' ); +const semver = require( 'semver' ); +const packagefile = './package.json'; +const pluginfile = './bluehost-wordpress-plugin.php'; -if (fs.existsSync('./package.json')) { - var package = require('./package.json'); - let currentVersion = package.version; - let type = process.argv[2]; - if (!['major', 'minor', 'patch'].includes(type)) { - type = 'patch'; - } +if ( fs.existsSync( packagefile ) && fs.existsSync( pluginfile ) ) { + const packageData = require( packagefile ); + const currentVersion = packageData.version; + let type = process.argv[ 2 ]; + if ( ! [ 'major', 'minor', 'patch' ].includes( type ) ) { + type = 'patch'; + } - let newVersion = semver.inc(package.version, type); - package.version = newVersion; - fs.writeFileSync('./package.json', JSON.stringify(package, null, 2)); + const newVersion = semver.inc( packageData.version, type ); + packageData.version = newVersion; + fs.writeFileSync( packagefile, JSON.stringify( packageData, null, 4 ) ); - console.log('Version updated', currentVersion, '=>', newVersion); -} \ No newline at end of file + fs.readFile( pluginfile, 'utf8', function ( err, data ) { + if ( err ) { + return console.log( err ); + } + const result = data.replaceAll( currentVersion, newVersion ); + + fs.writeFile( pluginfile, result, 'utf8', function ( err ) { + if ( err ) { + return console.log( err ); + } + } ); + } ); + + console.log( 'Version updated', currentVersion, '=>', newVersion ); +} From fc8a7bca39f35d35bf9f0b7941f4dc6d31678ed6 Mon Sep 17 00:00:00 2001 From: Evan Mullins Date: Thu, 5 Dec 2024 13:38:20 -0500 Subject: [PATCH 08/12] add cleanup, build and i18n to npm command too --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 066c25b81..6698076e6 100644 --- a/package.json +++ b/package.json @@ -88,7 +88,7 @@ "postprepare": "npm run set-wp-version", "prebuild:cleanup": "rm -rf ./build ./bluehost-wordpress-plugin ./bluehost-wordpress-plugin.zip ./vendor", "set-wp-version": "node ./set-latest-wp-version.js", - "set-version-bump": "node ./set-version-bump.js", + "set-version-bump": "node ./set-version-bump.js && rm -rf ./build && npm run build && composer run i18n", "simulate-runner-build": "npm run prebuild:cleanup && npm i --legacy-peer-deps && npm run php-deps && npm run build && npm run create:dist && npm run create:zip", "srb": "npm run simulate-runner-build", "start": "NODE_ENV=develop wp-scripts start", From 309141f38377000039981fb39935e5a1f875abe9 Mon Sep 17 00:00:00 2001 From: Evan Mullins Date: Thu, 5 Dec 2024 15:04:58 -0500 Subject: [PATCH 09/12] alpha order command --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 6698076e6..82ae23af4 100644 --- a/package.json +++ b/package.json @@ -87,8 +87,8 @@ "php-deps": "composer install --no-dev --optimize-autoloader", "postprepare": "npm run set-wp-version", "prebuild:cleanup": "rm -rf ./build ./bluehost-wordpress-plugin ./bluehost-wordpress-plugin.zip ./vendor", - "set-wp-version": "node ./set-latest-wp-version.js", "set-version-bump": "node ./set-version-bump.js && rm -rf ./build && npm run build && composer run i18n", + "set-wp-version": "node ./set-latest-wp-version.js", "simulate-runner-build": "npm run prebuild:cleanup && npm i --legacy-peer-deps && npm run php-deps && npm run build && npm run create:dist && npm run create:zip", "srb": "npm run simulate-runner-build", "start": "NODE_ENV=develop wp-scripts start", From 0c8e41b1d63aaa57ce50311723c73b37270d3a80 Mon Sep 17 00:00:00 2001 From: Evan Mullins Date: Thu, 5 Dec 2024 15:23:18 -0500 Subject: [PATCH 10/12] also include npm i to update package lock file with new version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 82ae23af4..ddee05e72 100644 --- a/package.json +++ b/package.json @@ -87,7 +87,7 @@ "php-deps": "composer install --no-dev --optimize-autoloader", "postprepare": "npm run set-wp-version", "prebuild:cleanup": "rm -rf ./build ./bluehost-wordpress-plugin ./bluehost-wordpress-plugin.zip ./vendor", - "set-version-bump": "node ./set-version-bump.js && rm -rf ./build && npm run build && composer run i18n", + "set-version-bump": "node ./set-version-bump.js && npm i && rm -rf ./build && npm run build && composer run i18n", "set-wp-version": "node ./set-latest-wp-version.js", "simulate-runner-build": "npm run prebuild:cleanup && npm i --legacy-peer-deps && npm run php-deps && npm run build && npm run create:dist && npm run create:zip", "srb": "npm run simulate-runner-build", From fd596d5405fea5f9dc81e9fec5a33b18faa0084e Mon Sep 17 00:00:00 2001 From: Evan Mullins Date: Thu, 5 Dec 2024 16:27:38 -0500 Subject: [PATCH 11/12] update plugin version to 3.15.7 --- bluehost-wordpress-plugin.php | 4 +- languages/wp-plugin-bluehost.pot | 130 +++++++++++++++---------------- package-lock.json | 4 +- package.json | 4 +- 4 files changed, 71 insertions(+), 71 deletions(-) diff --git a/bluehost-wordpress-plugin.php b/bluehost-wordpress-plugin.php index 4b724c063..18cbec106 100644 --- a/bluehost-wordpress-plugin.php +++ b/bluehost-wordpress-plugin.php @@ -12,7 +12,7 @@ * Plugin URI: https://bluehost.com * Update URI: https://github.com/bluehost/bluehost-wordpress-plugin * Description: WordPress plugin that integrates a WordPress site with the Bluehost control panel, including performance, security, and update features. - * Version: 3.15.6 + * Version: 3.15.7 * Requires at least: 6.5 * Requires PHP: 7.3 * Tested up to: 6.7.1 @@ -32,7 +32,7 @@ } // Define constants -define( 'BLUEHOST_PLUGIN_VERSION', '3.15.6' ); +define( 'BLUEHOST_PLUGIN_VERSION', '3.15.7' ); define( 'BLUEHOST_PLUGIN_FILE', __FILE__ ); define( 'BLUEHOST_PLUGIN_DIR', plugin_dir_path( __FILE__ ) ); define( 'BLUEHOST_PLUGIN_URL', plugin_dir_url( __FILE__ ) ); diff --git a/languages/wp-plugin-bluehost.pot b/languages/wp-plugin-bluehost.pot index e2757ab9f..080583a62 100644 --- a/languages/wp-plugin-bluehost.pot +++ b/languages/wp-plugin-bluehost.pot @@ -2,7 +2,7 @@ # This file is distributed under the GPL 2.0 or later. msgid "" msgstr "" -"Project-Id-Version: The Bluehost Plugin 3.15.6\n" +"Project-Id-Version: The Bluehost Plugin 3.15.7\n" "Report-Msgid-Bugs-To: https://github.com/bluehost/bluehost-wordpress-plugin/issues\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -86,43 +86,43 @@ msgstr "" #: inc/Admin.php:72 #: inc/Admin.php:289 -#: build/3.15.6/index.js:1 +#: build/3.15.7/index.js:1 msgid "Home" msgstr "" #: inc/Admin.php:75 -#: build/3.15.6/index.js:1 +#: build/3.15.7/index.js:1 msgid "Pages & Posts" msgstr "" #: inc/Admin.php:78 -#: build/3.15.6/index.js:1 +#: build/3.15.7/index.js:1 msgid "Store" msgstr "" #: inc/Admin.php:81 -#: build/3.15.6/index.js:1 +#: build/3.15.7/index.js:1 msgid "Marketplace" msgstr "" #: inc/Admin.php:86 -#: build/3.15.6/index.js:1 +#: build/3.15.7/index.js:1 msgid "My Plugins & Tools" msgstr "" #: inc/Admin.php:92 -#: build/3.15.6/index.js:1 +#: build/3.15.7/index.js:1 msgid "Performance" msgstr "" #: inc/Admin.php:96 #: inc/Admin.php:290 -#: build/3.15.6/index.js:1 +#: build/3.15.7/index.js:1 msgid "Settings" msgstr "" #: inc/Admin.php:101 -#: build/3.15.6/index.js:1 +#: build/3.15.7/index.js:1 msgid "Staging" msgstr "" @@ -196,221 +196,221 @@ msgstr "" msgid "Auto-updates enabled" msgstr "" -#: build/3.15.6/index.js:1 +#: build/3.15.7/index.js:1 msgid "Bluehost WordPress Plugin" msgstr "" -#: build/3.15.6/index.js:1 +#: build/3.15.7/index.js:1 msgid "Oh No, An Error!" msgstr "" -#: build/3.15.6/index.js:1 +#: build/3.15.7/index.js:1 msgid "You found an error, please refresh the page and try again!" msgstr "" -#: build/3.15.6/index.js:1 +#: build/3.15.7/index.js:1 msgid "If the error persists, please contact support." msgstr "" -#: build/3.15.6/index.js:1 +#: build/3.15.7/index.js:1 msgid "Error code:" msgstr "" -#: build/3.15.6/index.js:1 +#: build/3.15.7/index.js:1 msgid "Bluehost Account" msgstr "" -#: build/3.15.6/index.js:1 +#: build/3.15.7/index.js:1 msgid "There's nothing here!" msgstr "" -#: build/3.15.6/index.js:1 +#: build/3.15.7/index.js:1 msgid "Products & Services" msgstr "" -#: build/3.15.6/index.js:1 +#: build/3.15.7/index.js:1 msgid "Sales & Promotions" msgstr "" -#: build/3.15.6/index.js:1 +#: build/3.15.7/index.js:1 msgid "Sales Channel" msgstr "" -#: build/3.15.6/index.js:1 +#: build/3.15.7/index.js:1 msgid "Payments" msgstr "" -#: build/3.15.6/index.js:1 +#: build/3.15.7/index.js:1 msgid "Store Details" msgstr "" -#: build/3.15.6/index.js:1 +#: build/3.15.7/index.js:1 msgid "Help with WordPress" msgstr "" -#: build/3.15.6/index.js:1 +#: build/3.15.7/index.js:1 msgid "Admin" msgstr "" -#: build/3.15.6/index.js:1 +#: build/3.15.7/index.js:1 msgid "The staging feature provides a way to copy a site to test new updates, features or content." msgstr "" -#: build/3.15.6/index.js:1 -#: build/3.15.6/index.js:9 +#: build/3.15.7/index.js:1 +#: build/3.15.7/index.js:9 msgid "Sorry, that is not allowed." msgstr "" -#: build/3.15.6/index.js:1 -#: build/3.15.6/index.js:9 +#: build/3.15.7/index.js:1 +#: build/3.15.7/index.js:9 msgid "This feature cannot currently be modified." msgstr "" -#: build/3.15.6/index.js:1 -#: build/3.15.6/index.js:9 +#: build/3.15.7/index.js:1 +#: build/3.15.7/index.js:9 msgid "Oops! Something went wrong. Please try again." msgstr "" -#: build/3.15.6/index.js:1 +#: build/3.15.7/index.js:1 msgid "Phone" msgstr "" -#: build/3.15.6/index.js:1 +#: build/3.15.7/index.js:1 msgid "Call Us" msgstr "" -#: build/3.15.6/index.js:1 +#: build/3.15.7/index.js:1 msgid "Chat" msgstr "" -#: build/3.15.6/index.js:1 +#: build/3.15.7/index.js:1 msgid "Chat with one of our friendly Customer Care Specialists, as we are waiting to help. Open 24 hours - 7 days." msgstr "" -#: build/3.15.6/index.js:1 +#: build/3.15.7/index.js:1 msgid "Live Chat" msgstr "" -#: build/3.15.6/index.js:1 +#: build/3.15.7/index.js:1 msgid "Tweet" msgstr "" -#: build/3.15.6/index.js:1 +#: build/3.15.7/index.js:1 msgid "Find our team at @bluehost for updates on our products and support from our team." msgstr "" -#: build/3.15.6/index.js:1 +#: build/3.15.7/index.js:1 msgid "Tweet Us" msgstr "" -#: build/3.15.6/index.js:1 +#: build/3.15.7/index.js:1 msgid "YouTube" msgstr "" -#: build/3.15.6/index.js:1 +#: build/3.15.7/index.js:1 msgid "Find tutorials, answers, interviews and guides on our YouTube channel." msgstr "" -#: build/3.15.6/index.js:1 +#: build/3.15.7/index.js:1 msgid "Watch Now" msgstr "" -#: build/3.15.6/index.js:1 +#: build/3.15.7/index.js:1 msgid "Knowledge Base" msgstr "" -#: build/3.15.6/index.js:1 +#: build/3.15.7/index.js:1 msgid "Articles, guides, how-tos, instructions, and answers to our client's most frequently asked questions." msgstr "" -#: build/3.15.6/index.js:1 +#: build/3.15.7/index.js:1 msgid "Visit Knowledge Base" msgstr "" -#: build/3.15.6/index.js:1 +#: build/3.15.7/index.js:1 msgid "Resources" msgstr "" -#: build/3.15.6/index.js:1 +#: build/3.15.7/index.js:1 msgid "Boost your online knowledge and get ahead of the competition." msgstr "" -#: build/3.15.6/index.js:1 +#: build/3.15.7/index.js:1 msgid "Explore Resources" msgstr "" -#: build/3.15.6/index.js:1 +#: build/3.15.7/index.js:1 msgid "Events and Webinars" msgstr "" -#: build/3.15.6/index.js:1 +#: build/3.15.7/index.js:1 msgid "Team Bluehost organizes multiple webinars and events throughout the year. We are also sponsors and speak at most WordCamps across the world. Join us at our next event!" msgstr "" -#: build/3.15.6/index.js:1 +#: build/3.15.7/index.js:1 msgid "More Info" msgstr "" -#: build/3.15.6/index.js:1 +#: build/3.15.7/index.js:1 msgid "Bluehost Website" msgstr "" -#: build/3.15.6/index.js:1 +#: build/3.15.7/index.js:1 msgid "Not finding what you need? Visit our website for more information about our products and services." msgstr "" -#: build/3.15.6/index.js:1 +#: build/3.15.7/index.js:1 msgid "Go to Bluehost" msgstr "" -#: build/3.15.6/index.js:1 +#: build/3.15.7/index.js:1 msgid "Site Pages" msgstr "" -#: build/3.15.6/index.js:1 +#: build/3.15.7/index.js:1 msgid "Edit your homepage and other existing pages or add new pages to your site." msgstr "" -#: build/3.15.6/index.js:1 +#: build/3.15.7/index.js:1 msgid "View all" msgstr "" -#: build/3.15.6/index.js:1 +#: build/3.15.7/index.js:1 msgid "Add New" msgstr "" -#: build/3.15.6/index.js:1 +#: build/3.15.7/index.js:1 msgid "The Help Center provides guided, step-by-step assistance as you build your site." msgstr "" -#: build/3.15.6/index.js:1 +#: build/3.15.7/index.js:1 msgid "Site Status" msgstr "" -#: build/3.15.6/index.js:1 +#: build/3.15.7/index.js:1 msgid "Not Live" msgstr "" -#: build/3.15.6/index.js:1 +#: build/3.15.7/index.js:1 msgid "Live" msgstr "" -#: build/3.15.6/index.js:1 +#: build/3.15.7/index.js:1 msgid "Your Bluehost Coming Soon page lets you hide your site from visitors while you make the magic happen." msgstr "" -#: build/3.15.6/index.js:1 +#: build/3.15.7/index.js:1 msgid "Your website is currently displaying a \"Coming Soon\" page." msgstr "" #. translators: %s: number of weeks. `The trash will automatically empty every ${numTrashWeeks} weeks.` -#: build/3.15.6/index.js:3 +#: build/3.15.7/index.js:3 msgid "The trash will automatically empty every %s week." msgid_plural "The trash will automatically empty every %s weeks." msgstr[0] "" msgstr[1] "" #. translators: %s: number of comments. `Posts will display ${commentsPerPage} comments at a time.` -#: build/3.15.6/index.js:9 +#: build/3.15.7/index.js:9 msgid "WonderBlocks provides a library of customizable block patterns and page templates." msgstr "" diff --git a/package-lock.json b/package-lock.json index 0f27186f7..2fa998105 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "bluehost-wordpress-plugin", - "version": "3.15.6", + "version": "3.15.7", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "bluehost-wordpress-plugin", - "version": "3.15.6", + "version": "3.15.7", "license": "GPL-2.0-or-later", "dependencies": { "@heroicons/react": "^2.2.0", diff --git a/package.json b/package.json index 6357595ee..8ab78d071 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "bluehost-wordpress-plugin", - "version": "3.15.6", + "version": "3.15.7", "description": "WordPress plugin that integrates your WordPress site with the Bluehost control panel, including performance, security, and update features.", "author": { "name": "Bluehost", @@ -99,4 +99,4 @@ "test:unit": "wp-scripts test-unit-js", "test:clean-module": "bash scripts/test-clean-module" } -} +} \ No newline at end of file From 931637365b29bb82c9b113b97f29ab6239b06891 Mon Sep 17 00:00:00 2001 From: Evan Mullins Date: Thu, 5 Dec 2024 16:43:49 -0500 Subject: [PATCH 12/12] minor composer dependency updates --- composer.lock | 39 ++++++++++++++++++++------------------- 1 file changed, 20 insertions(+), 19 deletions(-) diff --git a/composer.lock b/composer.lock index 950ceaae0..26b00bc2a 100644 --- a/composer.lock +++ b/composer.lock @@ -2313,16 +2313,16 @@ }, { "name": "symfony/deprecation-contracts", - "version": "v2.5.3", + "version": "v2.5.4", "source": { "type": "git", "url": "https://github.com/symfony/deprecation-contracts.git", - "reference": "80d075412b557d41002320b96a096ca65aa2c98d" + "reference": "605389f2a7e5625f273b53960dc46aeaf9c62918" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/80d075412b557d41002320b96a096ca65aa2c98d", - "reference": "80d075412b557d41002320b96a096ca65aa2c98d", + "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/605389f2a7e5625f273b53960dc46aeaf9c62918", + "reference": "605389f2a7e5625f273b53960dc46aeaf9c62918", "shasum": "" }, "require": { @@ -2360,7 +2360,7 @@ "description": "A generic function and convention to trigger deprecation notices", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/deprecation-contracts/tree/v2.5.3" + "source": "https://github.com/symfony/deprecation-contracts/tree/v2.5.4" }, "funding": [ { @@ -2376,7 +2376,7 @@ "type": "tidelift" } ], - "time": "2023-01-24T14:02:46+00:00" + "time": "2024-09-25T14:11:13+00:00" }, { "name": "typesense/typesense-php", @@ -2792,16 +2792,16 @@ }, { "name": "wpscholar/url", - "version": "1.2.2", + "version": "1.2.3", "source": { "type": "git", "url": "https://github.com/wpscholar/url.git", - "reference": "c339972ed8e6876f1cfacbc512c6205db63645d0" + "reference": "6e97376a1cf3a9f4d0f0ae976cece6123d1bd4b8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/wpscholar/url/zipball/c339972ed8e6876f1cfacbc512c6205db63645d0", - "reference": "c339972ed8e6876f1cfacbc512c6205db63645d0", + "url": "https://api.github.com/repos/wpscholar/url/zipball/6e97376a1cf3a9f4d0f0ae976cece6123d1bd4b8", + "reference": "6e97376a1cf3a9f4d0f0ae976cece6123d1bd4b8", "shasum": "" }, "type": "library", @@ -2824,9 +2824,9 @@ "description": "A PHP class for parsing and manipulating URLs.", "support": { "issues": "https://github.com/wpscholar/url/issues", - "source": "https://github.com/wpscholar/url/tree/1.2.2" + "source": "https://github.com/wpscholar/url/tree/1.2.3" }, - "time": "2020-10-27T20:10:04+00:00" + "time": "2024-12-01T20:43:41+00:00" } ], "packages-dev": [ @@ -3583,12 +3583,12 @@ "source": { "type": "git", "url": "https://github.com/Roave/SecurityAdvisories.git", - "reference": "a5a85b1c0ac926a879fe4ea127944d271f53d1c2" + "reference": "4ed4a2ac17e6d7bec06301356c4e15f595e47842" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/a5a85b1c0ac926a879fe4ea127944d271f53d1c2", - "reference": "a5a85b1c0ac926a879fe4ea127944d271f53d1c2", + "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/4ed4a2ac17e6d7bec06301356c4e15f595e47842", + "reference": "4ed4a2ac17e6d7bec06301356c4e15f595e47842", "shasum": "" }, "conflict": { @@ -3729,7 +3729,7 @@ "dolibarr/dolibarr": "<19.0.2", "dompdf/dompdf": "<2.0.4", "doublethreedigital/guest-entries": "<3.1.2", - "drupal/core": ">=6,<6.38|>=7,<7.96|>=8,<10.2.9|>=10.3,<10.3.6|>=11,<11.0.5", + "drupal/core": ">=6,<6.38|>=7,<7.96|>=8,<10.2.10|>=10.3,<10.3.6|>=11,<11.0.5", "drupal/core-recommended": ">=8,<10.2.9|>=10.3,<10.3.6|>=11,<11.0.5", "drupal/drupal": ">=5,<5.11|>=6,<6.38|>=7,<7.80|>=8,<10.2.9|>=10.3,<10.3.6|>=11,<11.0.5", "duncanmcclean/guest-entries": "<3.1.2", @@ -4122,6 +4122,7 @@ "s-cart/s-cart": "<6.9", "sabberworm/php-css-parser": ">=1,<1.0.1|>=2,<2.0.1|>=3,<3.0.1|>=4,<4.0.1|>=5,<5.0.9|>=5.1,<5.1.3|>=5.2,<5.2.1|>=6,<6.0.2|>=7,<7.0.4|>=8,<8.0.1|>=8.1,<8.1.1|>=8.2,<8.2.1|>=8.3,<8.3.1", "sabre/dav": ">=1.6,<1.7.11|>=1.8,<1.8.9", + "samwilson/unlinked-wikibase": "<1.39.6|>=1.40,<1.40.2|>=1.41,<1.41.1", "scheb/two-factor-bundle": "<3.26|>=4,<4.11", "sensiolabs/connect": "<4.2.3", "serluck/phpwhois": "<=4.2.6", @@ -4153,14 +4154,14 @@ "silverstripe/userforms": "<3|>=5,<5.4.2", "silverstripe/versioned-admin": ">=1,<1.11.1", "simple-updates/phpwhois": "<=1", - "simplesamlphp/saml2": "<4.6.14|>=5.0.0.0-alpha1,<5.0.0.0-alpha18", + "simplesamlphp/saml2": "<4.6.14|==5.0.0.0-alpha12", "simplesamlphp/saml2-legacy": "<4.6.14", "simplesamlphp/simplesamlphp": "<1.18.6", "simplesamlphp/simplesamlphp-module-infocard": "<1.0.1", "simplesamlphp/simplesamlphp-module-openid": "<1", "simplesamlphp/simplesamlphp-module-openidprovider": "<0.9", "simplesamlphp/xml-common": "<1.20", - "simplesamlphp/xml-security": "<1.10", + "simplesamlphp/xml-security": "==1.6.11", "simplito/elliptic-php": "<1.0.6", "sitegeist/fluid-components": "<3.5", "sjbr/sr-freecap": "<2.4.6|>=2.5,<2.5.3", @@ -4422,7 +4423,7 @@ "type": "tidelift" } ], - "time": "2024-12-02T19:04:34+00:00" + "time": "2024-12-05T20:05:42+00:00" }, { "name": "squizlabs/php_codesniffer",