Release 2.7.0

.circleci/config.yml

@@ -9,52 +9,186 @@ anchors:
     machine:
       image: default
 
+  test_job_config: &test_job_config
+    <<: *context
+    requires:
+      - prepare
+
 jobs:
-  build_package_release:
+  prepare:
     <<: *default_job_config
     steps:
       - checkout
       - run:
-          name: Getting GravityKit test/build tools
+          name: Fetch tags
+          command: git fetch --tags
+      - run:
+          name: Create .npmrc
           command: |
-            git clone git@github.com:GravityKit/Tooling.git /home/circleci/tooling
+            echo "//npm.pkg.github.com/:_authToken=${GH_AUTH_TOKEN}" >> ~/.npmrc
+            echo "@gravitykit:registry=https://npm.pkg.github.com" >> ~/.npmrc
       - run:
-          name: Building and packaging
+          name: Install dependencies
           command: |
-            /home/circleci/tooling/build-tools/build_tools.sh composer -o "build"
-            if [ "${CIRCLE_BRANCH}" != "main" ]; then
-              /home/circleci/tooling/build-tools/build_tools.sh package_build -o "gf-entries-in-excel gfexcel.php --include-hash"
-            else
-              /home/circleci/tooling/build-tools/build_tools.sh package_build -o "gf-entries-in-excel gfexcel.php $([[ $(git log -n 1 | grep "\[skip release\]") ]] && echo --include-hash)"
+            npx @gravitykit/gktools composer install
+            npx @gravitykit/gktools npm install
+      - run:
+          name: Configure E2E environment
+          command: |
+            npx @gravitykit/gktools gh release download -R gravityforms/gravityforms --clobber --pattern "*.zip" --dir .tmp
+            unzip .tmp/gravityforms*.zip -d .tmp
+            cp .env.sample .env
+            sed -i "s|WP_ENV_PLUGINS=.*|WP_ENV_PLUGINS=${PWD}/.tmp/gravityforms|" .env
+            sed -i "s|GRAVITY_FORMS_LICENSE_KEY=.*|GRAVITY_FORMS_LICENSE_KEY=${GRAVITYFORMS_KEY}|" .env
+            sed -i "s|GRAVITYKIT_LICENSE_KEY=.*|GRAVITYKIT_LICENSE_KEY=${GRAVITYVIEW_KEY}|" .env
+      - persist_to_workspace:
+          root: /home/circleci
+          paths:
+            - .
+
+  run_e2e_tests:
+    <<: *default_job_config
+    parallelism: 1
+    resource_class: xlarge
+    steps:
+      - attach_workspace:
+          at: /home/circleci
+      - run:
+          name: Run E2E tests
+          command: |
+            attempt=0
+            max_attempts=3
+            sleep_time=5
+            while [ $attempt -lt $max_attempts ]; do
+              npm run tests:e2e:setup && break
+              attempt=$(( attempt + 1 ))
+              # Apache inside the wp-env container creates the bind-mounted
+              # mu-plugin files (e2e-fixtures.php, e2e-mail-capture.php) as
+              # uid 0, so a plain `rm -rf` from the circleci user fails on
+              # them and every retry hits the same "permission denied"
+              # state. Stop the containers first, then clean up with sudo
+              # which is available on CircleCI Linux machine runners.
+              (cd tests/E2E/setup && npx wp-env stop 2>/dev/null) || true
+              sudo rm -rf /home/circleci/.wp-env
+              echo "Retrying WP-ENV setup in $sleep_time seconds… (attempt $attempt/$max_attempts)"
+              sleep $sleep_time
+            done
+            if [ $attempt -eq $max_attempts ]; then
+              echo "WP-ENV setup failed."
+              exit 1
             fi
-            mkdir -p gf-entries-in-excel
-            cp -R build gf-entries-in-excel
-            rm -rf gf-entries-in-excel/build/composer.* gf-entries-in-excel/build/strauss.phar
-            zip -gr $(ls gf-entries-in-excel-*.zip) gf-entries-in-excel
-            zip -d $(ls gf-entries-in-excel-*.zip)  "gf-entries-in-excel/src/*" "gf-entries-in-excel/assets/*"
-            mkdir .release
-            cp gf-entries-in-excel-*.zip .release
+            TESTFILES=$(circleci tests glob "tests/E2E/tests/**/*.spec.js")
+            echo "$TESTFILES" | circleci tests run --command="xargs npx playwright test --config=tests/E2E/setup/playwright.config.js" --verbose
+      - store_artifacts:
+          path: tests/E2E/results
+      - store_artifacts:
+          path: tests/E2E/report
+      - store_test_results:
+          path: tests/E2E/results/junit.xml
+
+  build_package_release:
+    <<: *default_job_config
+    steps:
+      - attach_workspace:
+          at: /home/circleci
       - run:
-          name: Creating a GitHub release
+          name: Configure git
+          command: |
+            git config user.email "support@gravitykit.com"
+            git config user.name "GravityKit - CI"
+      - run:
+          name: Replace @since tags
           command: |
             if [ "${CIRCLE_BRANCH}" == "main" ]; then
-              git config user.email "support@gravitykit.com"
-              git config user.name "GravityKit - CI"
-              /home/circleci/tooling/build-tools/build_tools.sh create_release -o "gfexcel.php $(ls gf-entries-in-excel-*.zip)"
+              npx @gravitykit/gktools replace-since --commit
+            else
+              echo "Skipping @since tag replacement (only runs on main, before release build)."
             fi
       - run:
-          name: Notifying GravityKit Release Manager
+          name: Build and package
+          command: npx @gravitykit/gktools build
+      - run:
+          name: Trigger translation pipeline
           command: |
-            if ! [[ $(git log -n 1 | grep "\[skip notify\]") ]]; then
-              /home/circleci/tooling/build-tools/build_tools.sh announce_build -o "gfexcel.php $(ls gf-entries-in-excel-*.zip) --with-circle"
+            if [ "${CIRCLE_BRANCH}" == "develop" ] || [ "${CIRCLE_BRANCH}" == "main" ]; then
+              npx @gravitykit/gktools translate gk-gravityexport-lite --commit --push
+            else
+              echo "Skipping translation pipeline."
             fi
+      - run:
+          name: Collect build artifacts
+          command: |
+            mkdir -p .release
+            cp gf-entries-in-excel-*.zip .release/
       - store_artifacts:
           path: .release
           destination: release
+      - persist_to_workspace:
+          root: /home/circleci
+          paths:
+            - plugin/.release
+            - plugin/gf-entries-in-excel-*.zip
+
+  run_post_build_smoke:
+    <<: *default_job_config
+    machine:
+      image: default
+    resource_class: xlarge
+    steps:
+      - attach_workspace:
+          at: /home/circleci
+      - run:
+          name: Post-build smoke
+          # Unzips .release/*.zip, restores dev deps via gktools' Docker composer,
+          # boots wp-env with retry, runs `playwright test --grep=@smoke` against
+          # the built artifact. See @gravitykit/e2e-bootstrap README for details.
+          command: |
+            npx @gravitykit/e2e-bootstrap smoke \
+              --composer-cmd "npx @gravitykit/gktools composer install"
+      - store_artifacts:
+          path: tests/E2E/results
+      - store_artifacts:
+          path: tests/E2E/report
+      - store_test_results:
+          path: tests/E2E/results/junit.xml
+
+  publish_release:
+    <<: *default_job_config
+    steps:
+      - attach_workspace:
+          at: /home/circleci
+      - run:
+          name: Configure git
+          command: |
+            git config user.email "support@gravitykit.com"
+            git config user.name "GravityKit - CI"
+      - run:
+          name: Create GitHub release
+          command: npx @gravitykit/gktools release
+      - run:
+          name: Announce build
+          command: |
+            if ! git log -1 --pretty=%B | grep -iq "\[skip notify\]"; then
+              npx @gravitykit/gktools announce
+            fi
 
 workflows:
   version: 2
-  test_and_package:
+  test_and_release:
     jobs:
+      - prepare:
+          <<: *context
+      - run_e2e_tests:
+          <<: *test_job_config
       - build_package_release:
           <<: *context
+          requires:
+            - prepare
+      - run_post_build_smoke:
+          <<: *context
+          requires:
+            - build_package_release
+      - publish_release:
+          <<: *context
+          requires:
+            - run_post_build_smoke

.env.sample

@@ -0,0 +1,8 @@
+WP_ENV_PLUGINS=
+
+GRAVITY_FORMS_LICENSE_KEY=
+GRAVITYKIT_LICENSE_KEY=
+
+# E2E_KEEP_DATA=0
+# USE_LOCAL_BROWSER=0
+# SLOW_MO=0

.gitattributes

@@ -21,4 +21,12 @@ phpstan-stubs export-ignore
 /.github export-ignore
 /.idea export-ignore
 /assets export-ignore
+/src export-ignore
 /tests export-ignore
+.env.sample export-ignore
+Gruntfile.js export-ignore
+package.json export-ignore
+package-lock.json export-ignore
+translations.pot export-ignore
+.gktools.json export-ignore
+.gktools.env export-ignore

.gitignore

@@ -14,3 +14,20 @@ vendor_prefixed
 !build/strauss.phar
 !build/vendor_prefixed/.gitkeep
 phpstan.neon
+
+# Environment
+.env
+
+# E2E Testing
+tests/E2E/setup/.wp-env.json
+tests/E2E/setup/.e2e-ports.json
+tests/E2E/setup/.state.json
+tests/E2E/results/
+tests/E2E/report/
+tests/E2E/setup/mail-capture/
+.playwright-mcp/
+playwright-transform-*
+playwright_chromiumdev_profile-*
+
+# Claude Code
+.claude/

.gktools.json

@@ -0,0 +1,20 @@
+{
+	"build": [
+		"npm install",
+		"grunt",
+		"composer build"
+	],
+	"package": {
+		"prefix": "gf-entries-in-excel",
+		"includeExtra": ["build"],
+		"excludeFromExtra": [
+			"build/composer.json",
+			"build/composer.lock",
+			"build/strauss.phar"
+		]
+	},
+	"release": {
+		"branch": "main",
+		"mergeTo": "develop"
+	}
+}

Gruntfile.js

@@ -0,0 +1,58 @@
+module.exports = function ( grunt ) {
+	'use strict';
+
+	grunt.initConfig( {
+		addtextdomain: {
+			options: {
+				textdomain: 'gk-gravityexport-lite',
+				updateDomains: []
+			},
+			target: {
+				files: {
+					src: [
+						'*.php',
+						'src/**/*.php',
+						'!src/Addon/AddonHelperTrait.php',
+						'!src/Addon/GravityExportAddon.php',
+						'!src/Field/ProductField.php',
+						'!src/GravityForms/Field/DownloadFile.php',
+						'!src/Repository/FieldsRepository.php',
+						'public/**/*.php'
+					]
+				}
+			}
+		},
+
+		exec: {
+			makepot: {
+				cmd: function () {
+					var fileComments = [
+						'Copyright (C) ' + new Date().getFullYear() + ' GravityKit',
+						'This file is distributed under the GPLv2 or later',
+					];
+
+					var headers = {
+						'Last-Translator': 'GravityKit <support@gravitykit.com>',
+						'Language-Team': 'GravityKit <support@gravitykit.com>',
+						'Language': 'en_US',
+						'Plural-Forms': 'nplurals=2; plural=(n != 1);',
+						'Report-Msgid-Bugs-To': 'https://www.gravitykit.com/support',
+					};
+
+					var command = 'wp i18n make-pot --exclude=build,tests,vendor,assets . translations.pot';
+
+					command += ' --file-comment="' + fileComments.join( '\n' ) + '"';
+
+					command += ' --headers=\'' + JSON.stringify( headers ) + '\'';
+
+					return command;
+				}
+			}
+		}
+	} );
+
+	grunt.loadNpmTasks( 'grunt-exec' );
+	grunt.loadNpmTasks( 'grunt-wp-i18n' );
+
+	grunt.registerTask( 'default', [ 'addtextdomain', 'exec:makepot' ] );
+};

gfexcel.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * Plugin Name:     GravityExport Lite
- * Version:         2.6.0
+ * Version:         2.7.0
  * Plugin URI:      https://gfexcel.com
  * Description:     Export all Gravity Forms entries to Excel (.xlsx) or CSV via a secret shareable URL.
  * Author:          GravityKit
@@ -28,13 +28,18 @@
 }
 
 if ( ! defined( 'GFEXCEL_PLUGIN_VERSION' ) ) {
-	define( 'GFEXCEL_PLUGIN_VERSION', '2.6.0' );
+	define( 'GFEXCEL_PLUGIN_VERSION', '2.7.0' );
 }
 
 if ( ! defined( 'GFEXCEL_MIN_PHP_VERSION' ) ) {
 	define( 'GFEXCEL_MIN_PHP_VERSION', '7.2' );
 }
 
+if ( ! defined( 'GFEXCEL_ATTACHMENT_NOTIFICATIONS_API_VERSION' ) ) {
+	// Capability marker: attaching the single-entry export to multiple notifications is supported.
+	define( 'GFEXCEL_ATTACHMENT_NOTIFICATIONS_API_VERSION', 1 );
+}
+
 $src_folder    = __DIR__ . '/build/vendor_prefixed/gravitykit/gravityexport-lite-src';
 if ( ! is_readable( $src_folder ) ) {
 	$src_folder = __DIR__ . '/src';