Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump the npm_and_yarn group across 1 directory with 6 updates #186

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
a35e90d
Bump the npm_and_yarn group across 1 directory with 6 updates
dependabot[bot] Mar 29, 2024
7d7bf86
update the asset path
faisal-alvi Jun 11, 2024
0e67e6c
enqueue assets in a different way
faisal-alvi Jun 11, 2024
e143ca2
update the node v in lint workflow
faisal-alvi Jun 11, 2024
0d4991d
add prettier as dev dep
faisal-alvi Jun 11, 2024
28b7292
revert changes
faisal-alvi Jun 11, 2024
bc8a514
resolve conflicts
faisal-alvi Jun 11, 2024
3915944
update the eslint workflow
faisal-alvi Jun 11, 2024
c750ef6
install @wordpress/scripts
faisal-alvi Jun 11, 2024
f0dd3b3
eslint workflow update
faisal-alvi Jun 12, 2024
8a12324
trying to fix pipeline issues
faisal-alvi Jun 13, 2024
074a836
revert a few changes
faisal-alvi Jun 13, 2024
0e82023
eslint updates
faisal-alvi Jun 13, 2024
52e3009
retry new lint
faisal-alvi Jun 13, 2024
788f703
remove vipcs
faisal-alvi Jun 13, 2024
419a5bb
re update
faisal-alvi Jun 13, 2024
3d9d574
update lint
faisal-alvi Jun 13, 2024
4bdde6f
fix path
faisal-alvi Jun 14, 2024
6acff38
update workflows
faisal-alvi Jun 14, 2024
46fc59b
include assets via PHP
faisal-alvi Jun 14, 2024
86c0f3b
bump wp/env to see if fixes issue
faisal-alvi Jun 21, 2024
a230967
fix cypress "TypeError: readConfig is not a function" issue & Merge #…
faisal-alvi Jun 21, 2024
b6e6d6a
resolve conflicts
faisal-alvi Jun 21, 2024
ed835f8
fix "TypeError: prettier.getFileInfo.sync is not a function",
faisal-alvi Jun 21, 2024
a4efb07
add PHPCS check
faisal-alvi Jul 5, 2024
cf73135
install composer before phpcs check
faisal-alvi Jul 5, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 6 additions & 12 deletions .github/workflows/cypress.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,20 +37,14 @@ jobs:
run: ls -R
working-directory: ${{ github.event.repository.name }}

- name: Cache node_modules
id: cache-node-modules
uses: actions/cache@v3
env:
cache-name: cache-node-modules
- name: Setup node and npm cache
uses: actions/setup-node@v4
with:
path: |
node_modules
~/.cache
~/.npm
key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
node-version-file: .nvmrc
cache: npm

- name: Install dependencies
run: npm install
- name: Install Node dependencies
run: npm ci --no-optional

- name: Set the core version and plugins config
run: ./tests/bin/set-wp-config.js --core=${{ matrix.core.version }} --plugins=./${{ github.event.repository.name }}
Expand Down
62 changes: 22 additions & 40 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
name: Linting

env:
COMPOSER_VERSION: "2"
COMPOSER_CACHE: "${{ github.workspace }}/.composer-cache"

on:
push:
branches:
Expand All @@ -17,49 +13,35 @@ jobs:
eslint:
name: eslint
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- name: install node v12
uses: actions/setup-node@v1
with:
node-version: 12
- name: npm install
run: npm install
- name: eslint
uses: icrawl/action-eslint@v1
with:
custom-glob: assets
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
phpcs:
name: phpcs
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
- name: Set standard 10up cache directories
run: |
composer config -g cache-dir "${{ env.COMPOSER_CACHE }}"
- name: Prepare composer cache
uses: actions/cache@v2
- uses: actions/checkout@v4

- name: Setup node and npm cache
uses: actions/setup-node@v4
with:
path: ${{ env.COMPOSER_CACHE }}
key: composer-${{ env.COMPOSER_VERSION }}-${{ hashFiles('**/composer.lock') }}
restore-keys: |
composer-${{ env.COMPOSER_VERSION }}-
- name: Set PHP version
uses: shivammathur/setup-php@v2
node-version-file: .nvmrc
cache: npm

- name: Install Node dependencies
run: npm ci --no-optional

- name: Get updated JS files
id: changed-files
uses: tj-actions/changed-files@v42
with:
php-version: '7.4'
coverage: none
tools: composer:v2, cs2pr
files: |
**/*.js

- name: composer install
run: composer install --ignore-platform-reqs
- name: Check PHPCS standard
run: ./vendor/bin/phpcs -i

- name: PHPCS check
id: phpcs
run: ./vendor/bin/phpcs . --runtime-set testVersion 7.4- --report-checkstyle=${RUNNER_TEMP}/phpcs-report.xml
- name: Show PHPCS results in PR
if: ${{ always() && steps.phpcs.outcome == 'failure' }}
run: cs2pr --graceful-warnings ${RUNNER_TEMP}/phpcs-report.xml

- name: Run JS linting
if: ${{ steps.changed-files.outputs.any_changed == 'true' }}
run: ./node_modules/.bin/10up-toolkit lint-js ${{ steps.changed-files.outputs.all_changed_files }}
1 change: 1 addition & 0 deletions .nvmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
v14.21.1
3 changes: 1 addition & 2 deletions includes/blocks/block-editor/tabs-item/block.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,5 @@
"reusable": false,
"html": false
},
"parent":[ "tenup/tabs" ],
"editorScript": "file:../../../../dist/blocks/tabs-item-block/editor.js"
"parent":[ "tenup/tabs" ]
}
18 changes: 18 additions & 0 deletions includes/blocks/block-editor/tabs-item/register.php
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,24 @@ function register() {
]
);
}

// Enqueue assets.
add_action( 'enqueue_block_assets', $n( 'enqueue_block_assets' ) );
}

/**
* Enqueue block assets.
*/
function enqueue_block_assets() {
$asset_file = include PUBLISHER_MEDIA_KIT_PATH . 'dist/blocks/tabs-item-block.asset.php';

wp_enqueue_script(
'publisher-media-kit-tabs-item-block',
PUBLISHER_MEDIA_KIT_URL . '/dist/blocks/tabs-item-block.js',
$asset_file['dependencies'],
$asset_file['version'],
true
);
}

/**
Expand Down
5 changes: 1 addition & 4 deletions includes/blocks/block-editor/tabs/block.json
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,5 @@
},
"supports": {
"html": false
},
"editorScript": "file:../../../../dist/blocks/tabs-block/editor.js",
"editorStyle": "file:../../../../dist/blocks/tabs-block/editor.css",
"style": "file:../../../../dist/blocks/tabs-block/editor.css"
}
}
25 changes: 25 additions & 0 deletions includes/blocks/block-editor/tabs/register.php
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,31 @@ function register() {
]
);
}

// Enqueue assets.
add_action( 'enqueue_block_assets', $n( 'enqueue_block_assets' ) );
}

/**
* Enqueue block assets.
*/
function enqueue_block_assets() {
$asset_file = include PUBLISHER_MEDIA_KIT_PATH . 'dist/blocks/tabs-block.asset.php';

wp_enqueue_script(
'publisher-media-kit-tabs-block',
PUBLISHER_MEDIA_KIT_URL . '/dist/blocks/tabs-block.js',
$asset_file['dependencies'],
$asset_file['version'],
true
);

wp_enqueue_style(
'publisher-media-kit-tabs-block',
PUBLISHER_MEDIA_KIT_URL . '/dist/blocks/tabs-block.css',
[],
$asset_file['version']
);
}

/**
Expand Down
Loading
Loading