Merge pull request #322 from newfold-labs/release/2.1.0

Release/2.1.0
newfold-labs · Jul 31, 2024 · 84618c3 · 84618c3
2 parents 4ed7d8b + defe13f
commit 84618c3
Show file tree

Hide file tree

Showing 71 changed files with 7,506 additions and 9,120 deletions.
diff --git a/.github/workflows/add-to-project.yml b/.github/workflows/add-to-project.yml
@@ -10,7 +10,7 @@ jobs:
     name: Add issue to project
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/add-to-project@v0.5.0
+      - uses: actions/add-to-project@v1.0.2
         with:
           project-url: https://github.com/orgs/newfold-labs/projects/1
           github-token: ${{ secrets.PROJECT_TOKEN }}
diff --git a/.github/workflows/cypress-matrix.yml b/.github/workflows/cypress-matrix.yml
@@ -21,17 +21,16 @@ jobs:
       fail-fast: false
       matrix:
         phpVersion:
-          - '7.1'
-          - '7.2'
           - '7.3'
           - '7.4'
           - '8.0'
           - '8.1'
           - '8.2'
+          - '8.3'
         wpVersion:
-          - '6.2'
-          - '6.3'
           - '6.4'
+          - '6.5'
+          - '6.6'
 
     steps:
 
@@ -55,18 +54,18 @@ jobs:
           echo "DIST=${PWD}/dist" >> $GITHUB_OUTPUT
           echo "PACKAGE=${REPO##*/}" >> $GITHUB_OUTPUT
 
-      - name: Use Node.js 16.x
+      - name: Use Node.js 20.x
         uses: actions/setup-node@v4
         with:
-          node-version: 16.x
+          node-version: 20.x
           cache: 'npm'
 
       - name: Get Composer cache directory
         id: composer-cache
         run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
 
       - name: Cache Composer vendor directory
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ${{ steps.composer-cache.outputs.dir }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
@@ -123,7 +122,7 @@ jobs:
 
       - name: Store screenshots of test failures
         if: ${{ failure() }}
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: screenshots
           path: ./tests/cypress/screenshots

diff --git a/.github/workflows/cypress-tests-beta.yml b/.github/workflows/cypress-tests-beta.yml
@@ -36,18 +36,18 @@ jobs:
           mkdir dist
           echo "DIST=${PWD}/dist" >> $GITHUB_OUTPUT
           echo "PACKAGE=${REPO##*/}" >> $GITHUB_OUTPUT
-      - name: Use Node.js 16.x
+      - name: Use Node.js 20.x
         uses: actions/setup-node@v4
         with:
-          node-version: 16.x
+          node-version: 20.x
           cache: 'npm'
 
       - name: Get Composer cache directory
         id: composer-cache
         run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
 
       - name: Cache Composer vendor directory
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ${{ steps.composer-cache.outputs.dir }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
@@ -104,7 +104,7 @@ jobs:
 
       - name: Store screenshots of test failures
         if: failure()
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: screenshots
           path: ./tests/cypress/screenshots

diff --git a/.github/workflows/cypress.yml b/.github/workflows/cypress.yml
@@ -47,17 +47,17 @@ jobs:
           echo "DIST=${PWD}/dist" >> $GITHUB_OUTPUT
           echo "PACKAGE=${REPO##*/}" >> $GITHUB_OUTPUT
 
-      - name: Use Node.js 16.x
+      - name: Use Node.js 20.x
         uses: actions/setup-node@v4
         with:
-          node-version: 16.x
+          node-version: 20.x
 
       - name: Get npm cache directory
         id: npm-cache
         run: echo "dir=$(npm config get cache)" >> $GITHUB_OUTPUT
 
       - name: Cache node modules
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ${{ steps.npm-cache.outputs.dir }}
           key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
@@ -70,7 +70,7 @@ jobs:
         run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
 
       - name: Cache Composer vendor directory
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ${{ steps.composer-cache.outputs.dir }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
@@ -122,7 +122,7 @@ jobs:
 
       - name: Store screenshots of test failures
         if: ${{ failure() }}
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: screenshots
           path: ./tests/cypress/screenshots

diff --git a/.github/workflows/lint-php.yml b/.github/workflows/lint-php.yml
@@ -42,7 +42,7 @@ jobs:
         if: "!! env.GIT_DIFF"
 
       - name: Cache Composer vendor directory
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ${{ steps.composer-cache.outputs.dir }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}

diff --git a/.github/workflows/satis-webhook.yml b/.github/workflows/satis-webhook.yml
@@ -22,7 +22,7 @@ jobs:
         run: echo "VERSION=${GITHUB_REF##*/}" >> $GITHUB_OUTPUT
 
       - name: Repository Dispatch
-        uses: peter-evans/repository-dispatch@v2
+        uses: peter-evans/repository-dispatch@v3
         with:
           token: ${{ secrets.WEBHOOK_TOKEN }}
           repository: newfold-labs/satis

diff --git a/.github/workflows/upload-artifact-on-push.yml b/.github/workflows/upload-artifact-on-push.yml
@@ -42,17 +42,17 @@ jobs:
           echo "DIST=${PWD}/dist" >> $GITHUB_OUTPUT
           echo "PACKAGE=${REPO##*/}" >> $GITHUB_OUTPUT
 
-      - name: Use Node.js 16.x
+      - name: Use Node.js 20.x
         uses: actions/setup-node@v4
         with:
-          node-version: 16.x
+          node-version: 20.x
 
       - name: Get npm cache directory
         id: npm-cache
         run: echo "dir=$(npm config get cache)" >> $GITHUB_OUTPUT
 
       - name: Cache node modules
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ${{ steps.npm-cache.outputs.dir }}
           key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
@@ -64,7 +64,7 @@ jobs:
         run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
 
       - name: Cache Composer vendor directory
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ${{ steps.composer-cache.outputs.dir }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
@@ -100,7 +100,7 @@ jobs:
         working-directory: ${{ steps.workflow.outputs.DIST }}
         run: find .
 
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
           name: ${{ steps.workflow.outputs.PACKAGE }}
           path: ${{ steps.workflow.outputs.DIST }}
diff --git a/.github/workflows/upload-asset-on-release.yml b/.github/workflows/upload-asset-on-release.yml
@@ -54,17 +54,17 @@ jobs:
           echo "DIST=${PWD}/dist" >> $GITHUB_OUTPUT
           echo "PACKAGE=${REPO##*/}" >> $GITHUB_OUTPUT
 
-      - name: Set Node.js 16.x
+      - name: Set Node.js 20.x
         uses: actions/setup-node@v4
         with:
-          node-version: 16.x
+          node-version: 20.x
 
       - name: Get npm cache directory
         id: npm-cache
         run: echo "dir=$(npm config get cache)" >> $GITHUB_OUTPUT
 
       - name: Cache node modules
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ${{ steps.npm-cache.outputs.dir }}
           key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
@@ -76,7 +76,7 @@ jobs:
         run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
 
       - name: Cache Composer vendor directory
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ${{ steps.composer-cache.outputs.dir }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}

diff --git a/.github/workflows/wp-i18n.yml b/.github/workflows/wp-i18n.yml
@@ -39,17 +39,17 @@ jobs:
         run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
 
       - name: Cache Composer vendor directory
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ${{ steps.composer-cache.outputs.dir }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
           restore-keys: |
             ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
 
-      - name: Setup Node
+      - name: Use Node.js 20.x
         uses: actions/setup-node@v4
         with:
-          node-version: 16
+          node-version: 20.x
 
       - name: Log debug information
         run: |

diff --git a/.nvmrc b/.nvmrc
@@ -1 +1 @@
-v16.18.0
+v20
diff --git a/.wp-env.json b/.wp-env.json
@@ -1,5 +1,5 @@
 {
-  "core": "WordPress/WordPress#tags/6.4.1",
+  "core": "WordPress/WordPress#tags/6.6.1",
   "config": {
     "WP_DEBUG": true,
     "WP_DEBUG_LOG": true,
@@ -10,6 +10,9 @@
   "plugins": [
     "."
   ],
+  "themes": [
+    "https://downloads.wordpress.org/theme/yith-wonder.latest-stable.zip"
+  ],
   "port": 8884,
   "testsPort": 8885,
   "env": {

diff --git a/bootstrap.php b/bootstrap.php
@@ -11,6 +11,8 @@
 use WP_Forge\UpgradeHandler\UpgradeHandler;
 use NewfoldLabs\WP\ModuleLoader\Container;
 use NewfoldLabs\WP\ModuleLoader\Plugin;
+use NewfoldLabs\WP\Module\Features\Features;
+
 use function NewfoldLabs\WP\ModuleLoader\container as setContainer;
 
 // Composer autoloader
@@ -36,7 +38,7 @@
 $crazydomains_module_container->set(
 	'plugin',
 	$crazydomains_module_container->service(
-		function() {
+		function () {
 			return new Plugin(
 				array(
 					'id'           => 'crazy-domains',
@@ -133,3 +135,6 @@ function() {
 
 AdminBar::init();
 LoginRedirect::init();
+
+// Instantiate the Features singleton
+Features::getInstance();
diff --git a/composer.json b/composer.json
@@ -38,41 +38,65 @@
             "only": [
                 "newfold-labs/*"
             ]
+        },
+        "instawp": {
+            "type": "vcs",
+            "url": "git@github.com:InstaWP/connect-helpers.git",
+            "only": [
+                "instawp/*"
+            ]
         }
     },
     "scripts": {
         "fix": "vendor/bin/phpcbf --standard=phpcs.xml .",
         "lint": "vendor/bin/phpcs --standard=phpcs.xml -s .",
+        "i18n-pot": "vendor/bin/wp i18n make-pot . ./languages/wp-plugin-crazy-domains.pot --headers='{\"Report-Msgid-Bugs-To\":\"https://github.com/newfold-labs/wp-plugin-crazy-domains/issues\",\"POT-Creation-Date\":\"2023-01-11T20:21:44+00:00\"}' --exclude=assets,tests,src",
+        "i18n-po": "vendor/bin/wp i18n update-po ./languages/wp-plugin-crazy-domains.pot ./languages",
+        "i18n-mo": "vendor/bin/wp i18n make-mo ./languages",
+        "i18n-json": "rm languages/*.json && vendor/bin/wp i18n make-json ./languages --no-purge --pretty-print",
         "i18n": [
-            "vendor/bin/wp i18n make-pot . ./languages/wp-plugin-crazy-domains.pot --headers=Report-Msgid-Bugs-To:https://github.com/newfold-labs/wp-plugin-crazy-domains/issues --exclude=assets,storybook,tests",
-            "vendor/bin/wp i18n make-pot . ./languages/wp-plugin-crazy-domains.pot --headers=POT-Creation-Date:null --exclude=assets,storybook,tests"
+            "@i18n-pot",
+            "@i18n-po",
+            "@i18n-mo",
+            "@i18n-json"
         ]
     },
     "scripts-descriptions": {
         "fix": "Automatically fix coding standards issues where possible.",
         "lint": "Check files against coding standards.",
-        "i18n": "Generate a .pot file for translation."
+        "i18n": "Generate new language files.",
+        "i18n-pot": "Generate a .pot file for translation.",
+        "i18n-po": "Update existing .po files.",
+        "i18n-mo": "Generate new language .mo files.",
+        "i18n-json": "Generate new language .json files."
     },
     "require": {
         "doctrine/inflector": "1.2.0 as 1.3.1",
-        "newfold-labs/wp-module-coming-soon": "^1.1.12",
-        "newfold-labs/wp-module-data": "^2.4.11",
-        "newfold-labs/wp-module-deactivation": "^1.0.2",
-        "newfold-labs/wp-module-ecommerce": "^1.3.9",
+        "newfold-labs/wp-module-activation": "^1.0.3",
+        "newfold-labs/wp-module-atomic": "^1.3",
+        "newfold-labs/wp-module-coming-soon": "^1.2.5",
+        "newfold-labs/wp-module-context": "^1.0.1",
+        "newfold-labs/wp-module-data": "^2.6.1",
+        "newfold-labs/wp-module-deactivation": "^1.2.3",
+        "newfold-labs/wp-module-ecommerce": "^1.3.7",
+        "newfold-labs/wp-module-features": "^1.4.2",
         "newfold-labs/wp-module-loader": "^1.0.10",
-        "newfold-labs/wp-module-marketplace": "^2.1.0",
-        "newfold-labs/wp-module-notifications": "^1.2.1",
-        "newfold-labs/wp-module-onboarding": "1.11.8",
-        "newfold-labs/wp-module-performance": "1.2.2",
-        "newfold-labs/wp-module-runtime": "^1.0.7",
-        "newfold-labs/wp-module-secure-passwords": "^1.1",
-        "newfold-labs/wp-module-sso": "^1.0.4",
-        "wp-forge/wp-update-handler": "^1.0",
+        "newfold-labs/wp-module-marketplace": "^2.4.0",
+        "newfold-labs/wp-module-migration": "^1.0.8",
+        "newfold-labs/wp-module-notifications": "^1.4.0",
+        "newfold-labs/wp-module-onboarding": "^2.3.7",
+        "newfold-labs/wp-module-patterns": "^2.1.0",
+        "newfold-labs/wp-module-performance": "2.0.0 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",
+        "wp-forge/wp-update-handler": "^1.0.2",
         "wp-forge/wp-upgrade-handler": "^1.0"
     },
     "require-dev": {
-        "newfold-labs/wp-php-standards": "^1.2",
-        "wp-cli/i18n-command": "^2.2",
-        "wp-phpunit/wp-phpunit": "^6.2"
+        "newfold-labs/wp-php-standards": "^1.2.4",
+        "roave/security-advisories": "dev-latest",
+        "wp-cli/i18n-command": "^2.6.1",
+        "wp-phpunit/wp-phpunit": "^6.6.0"
     }
 }