Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
13 changes: 0 additions & 13 deletions .eslintrc

This file was deleted.

4 changes: 1 addition & 3 deletions .wp-env.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,7 @@
"./.wp-env/plugins/wp-grid-builder",
"./.wp-env/plugins/wordpress-seo"
],
"themes": [
"."
],
"themes": ["."],
"mappings": {
"wp-content/mu-plugins": "./.wp-env/mu-plugins",
"wp-content/plugins": "./.wp-env/plugins"
Expand Down
16 changes: 8 additions & 8 deletions .yarn/sdks/eslint/bin/eslint.js
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
#!/usr/bin/env node

const {existsSync} = require(`fs`);
const {createRequire} = require(`module`);
const {resolve} = require(`path`);
const { existsSync } = require(`fs`);
const { createRequire } = require(`module`);
const { resolve } = require(`path`);

const relPnpApiPath = "../../../../.pnp.cjs";
const relPnpApiPath = '../../../../.pnp.cjs';

const absPnpApiPath = resolve(__dirname, relPnpApiPath);
const absRequire = createRequire(absPnpApiPath);

if (existsSync(absPnpApiPath)) {
if (!process.versions.pnp) {
// Setup the environment to be able to require eslint/bin/eslint.js
require(absPnpApiPath).setup();
}
if (!process.versions.pnp) {
// Setup the environment to be able to require eslint/bin/eslint.js
require(absPnpApiPath).setup();
}
}

// Defer to the real eslint/bin/eslint.js your application uses
Expand Down
16 changes: 8 additions & 8 deletions .yarn/sdks/eslint/lib/api.js
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
#!/usr/bin/env node

const {existsSync} = require(`fs`);
const {createRequire} = require(`module`);
const {resolve} = require(`path`);
const { existsSync } = require(`fs`);
const { createRequire } = require(`module`);
const { resolve } = require(`path`);

const relPnpApiPath = "../../../../.pnp.cjs";
const relPnpApiPath = '../../../../.pnp.cjs';

const absPnpApiPath = resolve(__dirname, relPnpApiPath);
const absRequire = createRequire(absPnpApiPath);

if (existsSync(absPnpApiPath)) {
if (!process.versions.pnp) {
// Setup the environment to be able to require eslint
require(absPnpApiPath).setup();
}
if (!process.versions.pnp) {
// Setup the environment to be able to require eslint
require(absPnpApiPath).setup();
}
}

// Defer to the real eslint your application uses
Expand Down
8 changes: 4 additions & 4 deletions .yarn/sdks/eslint/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "eslint",
"version": "8.23.1-sdk",
"main": "./lib/api.js",
"type": "commonjs"
"name": "eslint",
"version": "8.23.1-sdk",
"main": "./lib/api.js",
"type": "commonjs"
}
2 changes: 1 addition & 1 deletion .yarn/sdks/integrations.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
# Manual changes might be lost!

integrations:
- vscode
- vscode
16 changes: 8 additions & 8 deletions .yarn/sdks/prettier/index.js
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
#!/usr/bin/env node

const {existsSync} = require(`fs`);
const {createRequire} = require(`module`);
const {resolve} = require(`path`);
const { existsSync } = require(`fs`);
const { createRequire } = require(`module`);
const { resolve } = require(`path`);

const relPnpApiPath = "../../../.pnp.cjs";
const relPnpApiPath = '../../../.pnp.cjs';

const absPnpApiPath = resolve(__dirname, relPnpApiPath);
const absRequire = createRequire(absPnpApiPath);

if (existsSync(absPnpApiPath)) {
if (!process.versions.pnp) {
// Setup the environment to be able to require prettier/index.js
require(absPnpApiPath).setup();
}
if (!process.versions.pnp) {
// Setup the environment to be able to require prettier/index.js
require(absPnpApiPath).setup();
}
}

// Defer to the real prettier/index.js your application uses
Expand Down
8 changes: 4 additions & 4 deletions .yarn/sdks/prettier/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "prettier",
"version": "2.7.1-sdk",
"main": "./index.js",
"type": "commonjs"
"name": "prettier",
"version": "2.7.1-sdk",
"main": "./index.js",
"type": "commonjs"
}
2 changes: 1 addition & 1 deletion .yarnrc.yml
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
nodeLinker: node-modules
yarnPath: .yarn/releases/yarn-4.5.0.cjs
yarnPath: .yarn/releases/yarn-4.5.0.cjs
1 change: 0 additions & 1 deletion config/plugins.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ module.exports = {
}),
new CleanWebpackPlugin(),
new ESLintPlugin({
overrideConfigFile: path.resolve(__dirname, '../.eslintrc'),
context: path.resolve(__dirname, '../src/js'),
files: '**/*.js',
}),
Expand Down
2 changes: 1 addition & 1 deletion config/svgo.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ module.exports = {
'convertStyleToAttrs',
'prefixIds',
],
}
};
12 changes: 12 additions & 0 deletions eslint.config.mjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
import wordpress from '@wordpress/eslint-plugin';

export default [
...wordpress.configs.recommended,
{
languageOptions: {
globals: {
jQuery: 'readonly',
},
},
},
];
82 changes: 41 additions & 41 deletions grumphp.yml
Original file line number Diff line number Diff line change
@@ -1,43 +1,43 @@
# grumphp.yml
grumphp:
tasks:
git_blacklist:
keywords:
- "var_dump("
- "console.log("
- "log("
- "<<<<<<< HEAD"
- "beapi.top"
- "beapi.space"
- "beapi.science"
- "beapi.xyz"
- "lndo.site"
whitelist_patterns: []
triggered_by: ['php', 'js', 'scss', 'css']
regexp_type: G
phplint:
exclude: ['vendor']
jobs: ~
triggered_by: ['php', 'phtml', 'php3', 'php4', 'php5', 'php7']
phpcs:
standard: ['phpcs.xml.dist']
triggered_by: [php]
composer:
no_check_all: true
no_check_publish: true
no_local_repository: true
jsonlint:
ignore_patterns: []
detect_key_conflicts: false
psalm:
config: psalm.xml
triggered_by: ['php']
show_info: true
npm_script:
script: lint
triggered_by: ['js', 'scss']
working_directory: "./web/app/themes/theme-name" # Change theme name here
is_run_task: true
silent: false
testsuites: []
extensions: []
tasks:
git_blacklist:
keywords:
- 'var_dump('
- 'console.log('
- 'log('
- '<<<<<<< HEAD'
- 'beapi.top'
- 'beapi.space'
- 'beapi.science'
- 'beapi.xyz'
- 'lndo.site'
whitelist_patterns: []
triggered_by: ['php', 'js', 'scss', 'css']
regexp_type: G
phplint:
exclude: ['vendor']
jobs: ~
triggered_by: ['php', 'phtml', 'php3', 'php4', 'php5', 'php7']
phpcs:
standard: ['phpcs.xml.dist']
triggered_by: [php]
composer:
no_check_all: true
no_check_publish: true
no_local_repository: true
jsonlint:
ignore_patterns: []
detect_key_conflicts: false
psalm:
config: psalm.xml
triggered_by: ['php']
show_info: true
npm_script:
script: lint
triggered_by: ['js', 'scss']
working_directory: './web/app/themes/theme-name' # Change theme name here
is_run_task: true
silent: false
testsuites: []
extensions: []
108 changes: 55 additions & 53 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,69 +19,71 @@
},
"license": "GPL-2.0",
"dependencies": {
"@beapi/be-a11y": "^1.6.2",
"@fontsource/poppins": "^5.0.5",
"oneloop.js": "^5.2.1"
"@beapi/be-a11y": "^2.0.0",
"@fontsource/poppins": "^5.2.7",
"oneloop.js": "^5.2.2"
},
"devDependencies": {
"@stylistic/stylelint-plugin": "^4.0.1",
"@wordpress/blocks": "^11.16.0",
"@wordpress/browserslist-config": "^6.21.0",
"@wordpress/dependency-extraction-webpack-plugin": "^4.0.0",
"@wordpress/dom-ready": "^3.17.0",
"@wordpress/env": "^9.8.0",
"@wordpress/eslint-plugin": "^22.7.0",
"@wordpress/hooks": "^3.17.0",
"@wordpress/scripts": "^31.0.0",
"@wordpress/stylelint-config": "^23.13.0",
"clean-webpack-plugin": "^4.0.0-alpha.0",
"concurrently": "^8.2.2",
"css-loader": "^5.2.4",
"cssnano": "^5.0.1",
"esbuild-loader": "^2.19.0",
"eslint": "^8.23.1",
"eslint-config-prettier": "^8.5.0",
"eslint-plugin-prettier": "^4.2.1",
"eslint-webpack-plugin": "^3.2.0",
"glob": "^13.0.0",
"@stylistic/stylelint-plugin": "^5.2.0",
"@wordpress/blocks": "^15.20.0",
"@wordpress/browserslist-config": "^6.47.0",
"@wordpress/data": "^10.47.0",
"@wordpress/dependency-extraction-webpack-plugin": "^6.47.0",
"@wordpress/dom-ready": "^4.47.0",
"@wordpress/env": "^11.7.0",
"@wordpress/eslint-plugin": "^25.3.0",
"@wordpress/hooks": "^4.47.0",
"@wordpress/scripts": "^32.3.0",
"@wordpress/stylelint-config": "^23.39.0",
"clean-webpack-plugin": "^4.0.0",
"concurrently": "^10.0.0",
"css-loader": "^7.1.4",
"cssnano": "^8.0.1",
"esbuild-loader": "^4.4.3",
"eslint": "^10.4.0",
"eslint-config-prettier": "^10.1.8",
"eslint-plugin-prettier": "^5.5.6",
"eslint-webpack-plugin": "^6.0.0",
"glob": "^13.0.6",
"glob-parent": "^6.0.2",
"image-minimizer-webpack-plugin": "^3.8.2",
"imagemin": "^8.0.1",
"image-minimizer-webpack-plugin": "^5.0.0",
"imagemin": "^9.0.1",
"imagemin-gifsicle": "^7.0.0",
"imagemin-jpegtran": "^7.0.0",
"imagemin-jpegtran": "^8.0.0",
"imagemin-optipng": "^8.0.0",
"imagemin-svgo": "^10.0.1",
"mini-css-extract-plugin": "^1.5.0",
"postcss": "^8.4.24",
"postcss-import": "^15.1.0",
"postcss-loader": "^7.3.2",
"postcss-preset-env": "^8.4.2",
"postcss-pxtorem": "^6.0.0",
"postcss-scss": "^4.0.6",
"postcss-sort-media-queries": "^5.2.0",
"prettier": "^2.2.1",
"sass": "^1.52.3",
"sass-loader": "^16.0.5",
"style-loader": "^2.0.0",
"stylelint": "^16.17.0",
"stylelint-config-recess-order": "^6.0.0",
"stylelint-webpack-plugin": "^5.0.1",
"svg-sprite-loader": "^6.0.10",
"svgo": "^3.0.2",
"svgo-loader": "^3.0.0",
"terser-webpack-plugin": "^5.3.6",
"webpack": "^5.35.0",
"webpack-bundle-analyzer": "^4.4.1",
"webpack-cli": "^4.6.0",
"webpack-merge": "^5.7.3",
"mini-css-extract-plugin": "^2.10.2",
"postcss": "^8.5.15",
"postcss-import": "^16.1.1",
"postcss-loader": "^8.2.1",
"postcss-preset-env": "^11.3.0",
"postcss-pxtorem": "^6.1.0",
"postcss-scss": "^4.0.9",
"postcss-sort-media-queries": "^6.6.1",
"prettier": "^3.8.3",
"sass": "^1.100.0",
"sass-loader": "^17.0.0",
"style-loader": "^4.0.0",
"stylelint": "^17.12.0",
"stylelint-config-recess-order": "^7.7.0",
"stylelint-order": "^8.1.1",
"stylelint-webpack-plugin": "^5.1.0",
"svg-sprite-loader": "^6.0.11",
"svgo": "^4.0.1",
"svgo-loader": "^5.0.0",
"terser-webpack-plugin": "^5.6.1",
"webpack": "^5.107.2",
"webpack-bundle-analyzer": "^5.3.0",
"webpack-cli": "^7.0.3",
"webpack-merge": "^6.0.1",
"webpack-php-manifest": "^0.0.9",
"webpack-remove-empty-scripts": "^1.1.1",
"webpack-watched-glob-entries-plugin": "^3.1.0",
"webpackbar": "^5.0.0-3"
"webpack-watched-glob-entries-plugin": "^3.2.0",
"webpackbar": "^7.0.0"
},
"volta": {
"node": "22.13.1",
"yarn": "4.5.0"
"node": "24.16.0",
"yarn": "4.15.0"

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Volta yarn version mismatches packageManager and yarnPath

Medium Severity

The volta.yarn field is set to "4.15.0" but packageManager remains "yarn@4.5.0", and .yarnrc.yml still references .yarn/releases/yarn-4.5.0.cjs (which is the only yarn binary present in the repo). Developers using Volta will get a different yarn version than what Corepack or the yarn binary provides, leading to inconsistent behavior across environments.

Additional Locations (2)
Fix in Cursor Fix in Web

Reviewed by Cursor Bugbot for commit 10e2b3d. Configure here.

},
"packageManager": "yarn@4.5.0"
}
3 changes: 2 additions & 1 deletion src/scss/common/01-mixins/_breakpoints.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
@use "sass:meta";
/**
* Breakpoints
*
Expand Down Expand Up @@ -26,7 +27,7 @@
@mixin breakpoints($breakpoint, $min-or-max-or-breakpoint: min) {
$font-size: 16px; // don't use em function whitout param, $font-size-base can be modified

@if (type-of(map.get($breakpoints, $min-or-max-or-breakpoint)) == "number") {
@if (meta.type-of(map.get($breakpoints, $min-or-max-or-breakpoint)) == "number") {

@media screen and (min-width: em(map.get($breakpoints, $breakpoint), $font-size)) and (max-width: em(map.get($breakpoints, $min-or-max-or-breakpoint) - 1, $font-size)) {
@content;
Expand Down
Loading