Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/bucket/waitlists' into feat/cust…
Browse files Browse the repository at this point in the history
…om-tables
  • Loading branch information
dpanta94 committed Dec 18, 2024
2 parents 43d5f81 + 01e4c81 commit 8d97285
Show file tree
Hide file tree
Showing 144 changed files with 8,487 additions and 578 deletions.
10 changes: 10 additions & 0 deletions .browserslistrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
last 2 Chrome versions
last 2 Firefox versions
last 2 Safari versions
last 2 Edge versions
last 2 Opera versions
last 2 iOS versions
last 1 Android version
last 1 ChromeAndroid version
last 1 FirefoxAndroid version
> 1%, not op_mini all, not ie <= 11, not ie_mob <= 11
7 changes: 3 additions & 4 deletions .distfiles
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
/lang/*.mo
/lang/*.pot
/lang/*.txt
/node_modules/clipboard/dist/clipboard.min.js
/node_modules/intro.js/*.css
/node_modules/intro.js/*.js
/node_modules/mt-a11y-dialog/*.min.js
/README.md
/src/admin-views/**/*
/src/Common/**/*
Expand All @@ -19,6 +15,8 @@
/src/resources/js/app/modules.min.js
/src/resources/js/app/vendor.min.js
/src/resources/js/utils/*.js
/src/resources/vendor/*.min.js
/src/resources/vendor/*.min.css
/src/Tribe/**/*
/src/views/**/*
/tribe-autoload.php
Expand All @@ -28,6 +26,7 @@
/vendor/datatables/**/*.png
/vendor/datatables/datatables*.css
/vendor/datatables/datatables*.js
/vendor/dayjs/**/*.min.js
/vendor/firebase/php-jwt/src/*.php
/vendor/handlebars/*.js
/vendor/jquery-tribe-timepicker/**/*.css
Expand Down
11 changes: 8 additions & 3 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout the repository
uses: actions/checkout@v2
uses: actions/checkout@v4
with:
fetch-depth: 1
submodules: recursive
Expand All @@ -20,9 +20,14 @@ jobs:
# ------------------------------------------------------------------------------
- name: Check for .nvmrc file
id: check-nvmrc
run: echo "::set-output name=exists::$(test -f ${{ github.workspace }}/.nvmrc && echo 'true' || echo 'false')"
run: |
if [ -f "${{ github.workspace }}/.nvmrc" ]; then
echo "exists=true" >> $GITHUB_OUTPUT
else
echo "exists=false" >> $GITHUB_OUTPUT
fi
- uses: actions/setup-node@v3
- uses: actions/setup-node@v4
if: steps.check-nvmrc.outputs.exists == 'true'
with:
node-version-file: '.nvmrc'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/process-changelog.yml
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ jobs:
uses: peter-evans/create-pull-request@v6
id: cpr
with:
token: ${{ secrets.GITHUB_TOKEN }}
token: ${{ secrets.GHA_BOT_TOKEN_MANAGER }}
base: ${{ github.ref }}
branch: "task/process-changelog/${{ steps.format_date.outputs.RELEASE_DATE }}/${{ steps.figure_out_version.outputs.RELEASE_VERSION }}/${{ steps.vars.outputs.sha_short }}"
title: "Process changelog for ${{ github.ref }}"
Expand Down
96 changes: 96 additions & 0 deletions .github/workflows/sync-translations.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,96 @@
name: 🔁 Sync Translations

on:
workflow_dispatch: # Allows you to run this workflow manually from the Actions tab
workflow_call:
secrets:
TRANSLATIONS_DEPLOY_HOST:
required: true
TRANSLATIONS_DEPLOY_USER:
required: true
TRANSLATIONS_DEPLOY_SSH_KEY:
required: true
TRANSLATIONS_DEPLOY_POT_LOCATION:
required: true

jobs:
sync-translations:
name: 🔁 Sync Translations
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
with:
ref: ${{ github.sha }}

- name: Set Variables
id: vars
run: |
branch_name="${{ github.head_ref || github.ref_name }}"
should_glotpress=0
if [[ "$branch_name" =~ ^release/.* || "$branch_name" == "master" || "$branch_name" == "main" ]]; then
should_glotpress=1
fi
echo "should_glotpress=$should_glotpress" >> $GITHUB_OUTPUT
echo "sha_short=$(git rev-parse --short ${{ github.sha }})" >> $GITHUB_OUTPUT
- name: Fetch Plugin Slug from .puprc
id: puprc
run: |
plugin_slug=$(jq '.i18n | map(select(.url | contains("translations.stellarwp.com")) | .slug) | first' .puprc)
echo "plugin_slug=$plugin_slug" >> $GITHUB_ENV
echo "plugin_slug=$plugin_slug" >> $GITHUB_OUTPUT
echo "## Plugin Slug: \`$plugin_slug\`" >> $GITHUB_STEP_SUMMARY
- uses: the-events-calendar/actions/.github/actions/generate-pot@main
id: generate-pot
with:
plugin_path: ${{ github.workspace }}
pot_path: ${{github.workspace}}/lang/${{ steps.puprc.outputs.plugin_slug }}.pot

- uses: the-events-calendar/actions/.github/actions/push-translations@main
id: push-translations
if: steps.vars.outputs.should_glotpress == '1'
with:
plugin_slug: ${{ steps.puprc.outputs.plugin_slug }}
pot_path: lang/${{ steps.puprc.outputs.plugin_slug }}.pot
env:
TRANSLATIONS_DEPLOY_HOST: ${{ secrets.TRANSLATIONS_DEPLOY_HOST }}
TRANSLATIONS_DEPLOY_USER: ${{ secrets.TRANSLATIONS_DEPLOY_USER }}
TRANSLATIONS_DEPLOY_SSH_KEY: ${{ secrets.TRANSLATIONS_DEPLOY_SSH_KEY }}
TRANSLATIONS_DEPLOY_POT_LOCATION: ${{ secrets.TRANSLATIONS_DEPLOY_POT_LOCATION }}

- uses: the-events-calendar/actions/.github/actions/add-changelog@main
id: add-changelog-entry
if: steps.vars.outputs.should_glotpress == '1'
with:
file: "task-i18n-${{ steps.vars.outputs.sha_short }}"
significance: patch
type: language
entry: "${{ steps.push-translations.outputs.glotpress-result }}"

- name: Create Pull Request
uses: peter-evans/create-pull-request@v7
id: create-pull-request
with:
token: ${{ secrets.GHA_BOT_TOKEN_MANAGER }}
base: ${{ github.head_ref || github.ref_name }}
branch: "task/i18n-update-${{ github.head_ref || github.ref_name }}-with-${{ steps.vars.outputs.sha_short }}"
title: "Generate Pot for ${{ github.head_ref || github.ref_name }}"
assignees: ${{ github.actor }}
reviewers: the-events-calendar/engineers
body: |
This is an automated PR created by ${{ github.actor }}.
It was generated by [this GitHub Action](https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}).
labels: "automation"
commit-message: |
:symbols: Updating .pot file and add language changelog for ${{ github.sha }}
This is an automated PR created by ${{ github.actor }}.
Generated by: https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}
- name: Check outputs
if: ${{ steps.create-pull-request.outputs.pull-request-number }}
run: |
echo "## Pull Request" >> $GITHUB_STEP_SUMMARY
echo "* Number - ${{ steps.create-pull-request.outputs.pull-request-number }}" >> $GITHUB_STEP_SUMMARY
echo "* URL - [${{ steps.create-pull-request.outputs.pull-request-url }}](${{ steps.create-pull-request.outputs.pull-request-url }})" >> $GITHUB_STEP_SUMMARY
8 changes: 8 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,14 @@ lang/*.mo

# Local packaging files
.pup-*
.pup-zip
pup.phar

# Strauss
bin/strauss.phar

# GitHub Actions
DOCKER_ENV
docker_tag
output.log
Dockerfile-php-build
18 changes: 12 additions & 6 deletions .puprc
Original file line number Diff line number Diff line change
@@ -1,29 +1,33 @@
{
"build": [
"composer -- pup",
"rm -rf vendor",
"git checkout -- vendor",
"composer install --no-dev",
"npm ci",
"npm ci --no-audit --no-fund",
"npm run build"
],
"build_dev": [
"composer -- pup",
"rm -rf vendor",
"git checkout -- vendor",
"composer install",
"npm ci",
"npm ci --no-audit --no-fund",
"npm run build"
],
"checks": {
"tbd": {
"dirs": [ "src" ]
"dirs": [
"src"
]
},
"version-conflict": {}
},
"i18n": [
{
"slug": "tribe-common",
"textdomain": "tribe-common",
"url": "https://translations.theeventscalendar.com",
"slug": "tribe-common"
"url": "https://translations.stellarwp.com/glotpress/"
}
],
"paths": {
Expand Down Expand Up @@ -53,7 +57,9 @@
"regex": "(\"version\": ?\")([^\"]+)"
}
],
"views": [ "src/views" ]
"views": [
"src/views"
]
},
"zip_name": "tribe-common"
}
5 changes: 0 additions & 5 deletions bin/clean-composer.sh

This file was deleted.

28 changes: 28 additions & 0 deletions changelog.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,33 @@
# Changelog

### [6.4.1] 2024-12-17

* Feature - Add an abstract admin page to start consolidating how we do admin pages. See the "First Time Setup" page (onboarding wizard) for an example. [TEC-5294]
* Tweak - Ensure we are not loading any assets from node_modules. Include anything we need as a 3rd party code in our plugin. [TCMN-175]
* Fix - Cast `$block` argument to string to avoid PHP 8+ deprecation notice when non string (or array) variables are passed as the 3rd argument of `preg_replace`.
* Fix - Correctly identify licenses using uplink, like Event Tickets Plus. [n/a]
* Fix - Ensure that number_format is used with a float value to prevent issues with PHP 8.0+. [ETP-962]
* Fix - Ensure we get an object to test for subnav. Pass the object to class filter for more context. [n/a]
* Fix - Prevent fatal on ET integration page when used with Events Pro but without Event Tickets Plus. [TCMN-174]
* Deprecated - Integrations Tab registration in Event Ticket Settings from common. These will be registered from Event Tickets Plus only instead. [TCMN-174]
* Language - 0 new strings added, 33 updated, 1 fuzzied, and 0 obsoleted.

### [6.4.0] 2024-12-05

* Feature - In-App Notifications system. [TEC-5165]
* Tweak - Added filters: `tec_common_ian_opt_in`, `tec_common_ian_conditional_php`, `tec_common_ian_conditional_wp`, `tec_common_ian_allowed_pages`, `tec_common_ian_show_icon`, `tec_common_ian_setting_optin_tooltip`, `tec_common_ian_api_url`, `tec_common_ian_slugs`, `tec_common_ian_render`
* Tweak - Added actions: `tec_common_ian_loaded`
* Language - 22 new strings added, 15 updated, 1 fuzzied, and 0 obsoleted.

### [6.3.2] 2024-11-19

* Feature - Implemented the core Help Hub logic, providing a flexible framework for managing support integrations, resource templates, and plugin-specific customization.
* Feature - Introduced Asset interface which accounts for symlinks, while still provides a fluent api. [SL-246]
* Feature - Update stellarwp/assets to version 1.4.2. [SL-246]
* Tweak - Added actions: `tec_help_hub_before_render`, `tec_help_hub_after_render`, `tec_help_hub_before_iframe_render`, `tec_help_hub_after_iframe_render`, `tec_help_hub_registered`.
* Tweak - Added filters: `tec_help_hub_resource_sections_{$data_class_name}`, `tec_help_hub_resource_sections`, `tec_help_hub_body_classes`.
* Language - 0 new strings added, 0 updated, 1 fuzzied, and 0 obsoleted.

### [6.3.1] 2024-11-04

* Fix - Prevent new Settings pages to over sanitize textarea fields, thus removing HTML from before/after in the Events UI. [TEC-5283]
Expand Down
40 changes: 24 additions & 16 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
"php": "7.4.0"
},
"allow-plugins": {
"cweagans/composer-patches": true,
"dealerdirect/phpcodesniffer-composer-installer": true,
"phpstan/extension-installer": true
}
Expand All @@ -24,32 +25,34 @@
"firebase/php-jwt": "~6.3.0",
"lucatume/di52": "^3.3.7",
"monolog/monolog": "1.24.*",
"psr/container": "^1.0.0",
"psr/container": "1.1.1",
"stellarwp/arrays": "1.2.2",
"stellarwp/container-contract": "^1.0.4",
"stellarwp/db": "^1.0.3",
"stellarwp/installer": "^1.1.0",
"stellarwp/models": "dev-main",
"stellarwp/schema": "^1.1.3",
"stellarwp/telemetry": "^2.3.1",
"stellarwp/assets": "^1.2.6",
"stellarwp/uplink": "2.2.1"
"stellarwp/assets": "1.4.2",
"stellarwp/admin-notices": "^1.1",
"stellarwp/uplink": "2.2.2"
},
"require-dev": {
"automattic/vipwpcs": "^3.0",
"wp-cli/wp-cli": ">=2.0 <3.0.0",
"bordoni/phpass": "0.3.5",
"codeception/codeception": "^2.5.5",
"cweagans/composer-patches": "^1.7",
"dealerdirect/phpcodesniffer-composer-installer": "^0.7.2",
"fakerphp/faker": "^1.23",
"lucatume/codeception-snapshot-assertions": "^0.2.4",
"lucatume/function-mocker-le": "^1.0",
"lucatume/wp-browser": "^3.0.14",
"stellarwp/coding-standards": "dev-main",
"the-events-calendar/tec-testing-facilities": "dev-master",
"wp-cli/checksum-command": "1.0.5",
"wp-coding-standards/wpcs": "^3.0.0",
"automattic/jetpack-changelogger": "^4.2",
"fakerphp/faker": "^1.23"
"automattic/jetpack-changelogger": "^4.2"
},
"autoload": {
"psr-4": {
Expand All @@ -70,19 +73,22 @@
"test -f ./bin/strauss.phar || curl -o bin/strauss.phar -L -C - https://github.com/BrianHenryIE/strauss/releases/download/0.19.4/strauss.phar",
"vendor/stellarwp/installer/bin/set-domain domain=tribe-common",
"@php -d display_errors=on bin/strauss.phar",
"@composer dump-autoload",
"@clean-strauss-static-function-autoload"
"@composer dump-autoload"
],
"post-install-cmd": [
"@strauss",
"@stellar-uplink"
"@stellar-uplink",
"@strauss"
],
"post-update-cmd": [
"@strauss",
"@stellar-uplink"
"@stellar-uplink",
"@strauss"
],
"stellar-uplink": [
"vendor/bin/stellar-uplink domain=tribe-common"
],
"pup": [
"test -f ./bin/pup.phar || curl -o ./bin/pup.phar -L -C - https://github.com/stellarwp/pup/releases/download/1.3.7/pup.phar",
"@php bin/pup.phar"
]
},
"extra": {
Expand All @@ -106,13 +112,10 @@
"firebase/php-jwt",
"psr/container",
"stellarwp/assets",
"fakerphp/faker"
"stellarwp/admin-notices"
],
"exclude_from_prefix": {
"file_patterns": [],
"namespaces": [
"Faker"
]
"file_patterns": []
},
"delete_vendor_files": true,
"include_modified_date": false,
Expand All @@ -139,6 +142,11 @@
"filename": "bin/ModifiedSemverVersioning.php"
},
"changes-dir": "changelog"
},
"patches": {
"fakerphp/faker": {
"Use prefixed Psr\\Container\\ContainerInterface": "tests/_patches/faker-use-prefixed-containerinterface.patch"
}
}
}
}
Loading

0 comments on commit 8d97285

Please sign in to comment.