Skip to content

Commit

Permalink
Merge branch 'master' into fix/ECP-1400-bad-ct1-paths
Browse files Browse the repository at this point in the history
  • Loading branch information
Camwyn committed Mar 20, 2024
2 parents 0b7055a + 4f84ad0 commit 838d686
Show file tree
Hide file tree
Showing 1,114 changed files with 63,679 additions and 107,223 deletions.
54 changes: 54 additions & 0 deletions .distfiles
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
/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/**/*
/src/deprecated/**/*
/src/functions/**/*
/src/modules/icons/*
/src/resources/css/**/*.min.css
/src/resources/images/**/*
/src/resources/js/*.js
/src/resources/js/admin/*.js
/src/resources/js/app/main.min.js
/src/resources/js/app/modules.min.js
/src/resources/js/app/vendor.min.js
/src/resources/js/utils/*.js
/src/Tribe/**/*
/src/views/**/*
/tribe-autoload.php
/vendor/attrchange/js/*.js
/vendor/autoload.php
/vendor/composer/*
/vendor/datatables/**/*.png
/vendor/datatables/datatables*.css
/vendor/datatables/datatables*.js
/vendor/firebase/php-jwt/src/*.php
/vendor/handlebars/*.js
/vendor/jquery-tribe-timepicker/**/*.css
/vendor/jquery-tribe-timepicker/**/*.min.js
/vendor/jquery-tribe-timepicker/**/*.png
/vendor/jquery/**/*
/vendor/ky/*
/vendor/momentjs/*.min.js
/vendor/monolog/monolog/src/*.php
/vendor/monolog/monolog/src/**/*.php
/vendor/psr/log/Psr/Log/*.php
/vendor/tooltipster/**/*.min.*
/vendor/tribe-select2/*.css
/vendor/tribe-select2/*.gif
/vendor/tribe-select2/*.min.js
/vendor/tribe-select2/*.png
/vendor/tribe-selectWoo/dist/css/*.css
/vendor/tribe-selectWoo/dist/js/*.js
/vendor/vendor-prefixed
/vendor/vendor-prefixed/**/*.js
/vendor/vendor-prefixed/**/*.php
/vendor/vendor-prefixed/autoload-classmap.php
/vendor/vendor-prefixed/autoload.php
/vendor/vendor-prefixed/stellarwp/**/*
12 changes: 12 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
root = true

[*]
charset = utf-8
end_of_line = lf
indent_style = tab
insert_final_newline = false
trim_trailing_whitespace = true

[**.{jshintrc,json,scss-lint,yml}]
indent_style = space
indent_size = 2
1 change: 1 addition & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
src/resources/js/**/*.min.js
27 changes: 27 additions & 0 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
### 🎫 Ticket

[TICKET_ID]
<!-- Ticket ID, if there's any put it between brackets -->

### 🗒️ Description

<!--
Please describe what you have changed or added
What types of changes does your code introduce?
Bug fix (non-breaking change which fixes an issue)
New feature (non-breaking change which adds functionality)
Include any important information for reviewers
-->

### 🎥 Artifacts <!-- if applicable-->
<!-- 🎥 screencast(s) or 📷 screenshot(s) -->

### ✔️ Checklist
- [ ] Changelog entry in the `readme.txt` file.
- [ ] Code is covered by **NEW** `wpunit` or `integration` tests.
- [ ] Code is covered by **EXISTING** `wpunit` or `integration` tests.
- [ ] Are all the **required** tests passing?
- [ ] Automated code review comments are addressed.
- [ ] Have you added Artifacts?
- [ ] Check the base branch for your PR.
- [ ] Add your PR to the project board for the release.
14 changes: 14 additions & 0 deletions .github/workflows/link-project.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
name: 'Link to Release Project'
on: [pull_request]
jobs:
link-project:
name: 'Link to Release Project'
runs-on: ubuntu-latest
steps:
- uses: the-events-calendar/gh-action-project-link@main
with:
github-token: ${{ secrets.GHA_BOT_TOKEN_MANAGER }}
template-project-url: https://github.com/orgs/the-events-calendar/projects/29
project-owner: 'tec-bot'
base-branch-pattern: 'release/*'
name-prefix-remove: 'release/'
5 changes: 2 additions & 3 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
name: 'npm lint'
on:
pull_request:
workflow_dispatch:
paths:
- 'src/modules/**.js'
- 'src/resources/js/**.js'
Expand Down Expand Up @@ -29,6 +30,4 @@ jobs:
. ~/.nvm/nvm.sh && nvm use && npm ci
- name: Run linting tasks
run: |
. ~/.nvm/nvm.sh && nvm use && npm run lint
. ~/.nvm/nvm.sh && nvm use && npm run lint
31 changes: 7 additions & 24 deletions .github/workflows/phpcs.yml
Original file line number Diff line number Diff line change
@@ -1,26 +1,9 @@
name: 'PHP CodeSniffer'
on:
pull_request:
paths:
- 'src/**.php'
- '*.php'
name: 'PHPCS'
on: [pull_request]
jobs:
phpcs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v1
with:
fetch-depth: 100
- name: Get Composer Cache Directory
id: composer-cache
run: |
echo "::set-output name=dir::$(composer config cache-files-dir)"
- uses: actions/cache@v1
with:
path: ${{ steps.composer-cache.outputs.dir }}
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
restore-keys: |
${{ runner.os }}-composer-
- uses: the-events-calendar/action-tribe-phpcs@master
with:
github-bot-token: ${{ secrets.GH_BOT_TOKEN }}
uses: stellarwp/github-actions/.github/workflows/phpcs.yml@main
with:
ref: ${{ github.event.inputs.ref }}
secrets:
access-token: ${{ secrets.GH_BOT_TOKEN }}
2 changes: 1 addition & 1 deletion .github/workflows/submodule-sync.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
uses: shivammathur/setup-php@v2
with:
php-version: '7.4'
tools: composer:v1
tools: composer:v2
env:
fail-fast: true

Expand Down
1 change: 1 addition & 0 deletions .github/workflows/tests-php.yml
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ jobs:
- name: Set up slic env vars
if: steps.skip.outputs.value != 1
run: |
echo "SLIC_COMPOSER_VERSION=2" >> $GITHUB_ENV
echo "SLIC_BIN=${GITHUB_WORKSPACE}/../slic/slic" >> $GITHUB_ENV
echo "SLIC_WP_DIR=${GITHUB_WORKSPACE}/../slic/_wordpress" >> $GITHUB_ENV
- name: Set run context for slic
Expand Down
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
node_modules
.phpstorm*
.vscode
bun.lockb

# Tests - local config files
codeception.yml
Expand Down Expand Up @@ -44,3 +45,6 @@ src/resources/js/**/*.min.js
# get from translate.wordpress.org as needed
lang/*.po
lang/*.mo

# Strauss
bin/strauss.phar
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
16.6.1
18.13.0
5 changes: 4 additions & 1 deletion .phpstorm.meta.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
namespace PHPSTORM_META {

// Allow PhpStorm IDE to resolve return types when calling tribe( Object_Type::class ) or tribe( `Object_Type` )
use TEC\Common\StellarWP\ContainerContract\ContainerInterface;

override(
\tribe(),
map( [
Expand Down Expand Up @@ -31,7 +33,6 @@
'context' => \Tribe__Context::class,
'post-transient' => \Tribe__Post_Transient::class,
'db' => \Tribe__Db::class,
'freemius' => \Tribe__Freemius::class,
'customizer' => \Tribe__Customizer::class,
'callback' => \Tribe__Utils__Callback::class,
'pue.notices' => \Tribe__PUE__Notices::class,
Expand All @@ -50,4 +51,6 @@
'' => '@class',
] )
);

override( ContainerInterface::get( 0 ), type( 0 ) );
}
16 changes: 1 addition & 15 deletions .stylelintrc
Original file line number Diff line number Diff line change
@@ -1,17 +1,3 @@
{
"extends": "@the-events-calendar/product-taskmaster/config/stylelint",
"rules": {
"font-family-no-missing-generic-family-keyword": [
true,
{
"ignoreFontFamilies": [ "dashicons" ],
}
],
"property-no-unknown": [
true,
{
"ignoreProperties": [ "font-smoothing" ]
}
]
}
"extends": "@the-events-calendar/product-taskmaster/config/stylelint"
}
3 changes: 0 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,6 @@ env:
- WP_ADMIN_PASSWORD="password"

before_install:
# Rollback Composer to version 1.
- composer self-update --rollback

# create the databases needed for the tests
- mysql -e "create database IF NOT EXISTS $DB_NAME;" -uroot
- mysql -e "create database IF NOT EXISTS $TEST_DB_NAME;" -uroot
Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ worth knowing.

## Standards

We have a set of [coding standards](http://the-events-calendar.github.io/products-engineering/)
We have a set of [coding standards](https://docs.theeventscalendar.com/developer/)
that we follow and encourage others to follow as well. When you submit
Pull Requests, you'll probably notice a friendly bot - `tr1b0t` - that
comments on your PR and suggests changes. Be gentle with him, he's only
Expand Down
Loading

0 comments on commit 838d686

Please sign in to comment.