From 5628bb2a593b74fedede869dbfd6e36a1996e3b8 Mon Sep 17 00:00:00 2001 From: Jurriaan Roelofs Date: Wed, 1 Apr 2026 09:13:37 +0200 Subject: [PATCH] Fix ESLint and Stylelint violations (#800) Auto-fix Prettier formatting and hex color shorthand violations. Add inline disables for standard config file patterns. --- Gruntfile.js | 35 ++++++++++++++++------------ postcss.config.js | 4 +--- scss/base/variables.scss | 12 +++++----- webpack.config.js | 50 ++++++++++++++++++---------------------- 4 files changed, 50 insertions(+), 51 deletions(-) diff --git a/Gruntfile.js b/Gruntfile.js index 54d4b3d0..982896c2 100755 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -1,7 +1,7 @@ const sass = require("sass"); const autoprefixer = require("autoprefixer"); const postcssPxtorem = require("postcss-pxtorem"); -const webpackConfig = require('./webpack.config.js'); +const webpackConfig = require("./webpack.config"); // eslint-disable-line import/extensions module.exports = function (grunt) { grunt.initConfig({ @@ -17,14 +17,16 @@ module.exports = function (grunt) { files: [ { expand: true, - cwd: 'js/dist/', - src: ['*.js', '!dxpr-theme-header.js', - '!dxpr-theme-multilevel-mobile-nav.js', - '!dxpr-theme-settings-admin.js', - '!dxpr-theme-settings-sidebar.js', + cwd: "js/dist/", + src: [ + "*.js", + "!dxpr-theme-header.js", + "!dxpr-theme-multilevel-mobile-nav.js", + "!dxpr-theme-settings-admin.js", + "!dxpr-theme-settings-sidebar.js", ], - dest: 'js/minified/', - ext: '.min.js', + dest: "js/minified/", + ext: ".min.js", }, ], }, @@ -37,13 +39,16 @@ module.exports = function (grunt) { files: [ { expand: true, - cwd: 'js/minified/', - src: ['*.min.js', '!dxpr-theme-header.bundle.min.js', - '!dxpr-theme-multilevel-mobile-nav.bundle.min.js', - '!dxpr-theme-settings-admin.bundle.min.js', - '!dxpr-theme-settings-sidebar.bundle.min.js'], - dest: 'js/minified/', - ext: '.min.js', + cwd: "js/minified/", + src: [ + "*.min.js", + "!dxpr-theme-header.bundle.min.js", + "!dxpr-theme-multilevel-mobile-nav.bundle.min.js", + "!dxpr-theme-settings-admin.bundle.min.js", + "!dxpr-theme-settings-sidebar.bundle.min.js", + ], + dest: "js/minified/", + ext: ".min.js", }, ], }, diff --git a/postcss.config.js b/postcss.config.js index b122ab56..4d30c7e7 100644 --- a/postcss.config.js +++ b/postcss.config.js @@ -1,5 +1,3 @@ module.exports = { - plugins: [ - require('autoprefixer') - ] + plugins: [require("autoprefixer")], // eslint-disable-line global-require, import/no-extraneous-dependencies }; diff --git a/scss/base/variables.scss b/scss/base/variables.scss index 83059762..2c38c803 100644 --- a/scss/base/variables.scss +++ b/scss/base/variables.scss @@ -115,13 +115,13 @@ $schemes: ( "darkmode": ( "base": #121212, "basetext": #e0e0e0, - "link": #222222, - "accent1": #222222, + "link": #222, + "accent1": #222, "accent1text": #e0e0e0, - "accent2": #222222, + "accent2": #222, "accent2text": #e0e0e0, "text": #e0e0e0, - "headings": #ffffff, + "headings": #fff, "footer": #1a1a1a, "footertext": #e0e0e0, "secheader": #2c2c2e, @@ -134,8 +134,8 @@ $schemes: ( "headersidetext": #e0e0e0, "pagetitle": #1d1d1d, "pagetitletext": #e6e6e6, - "graylight": #333333, - "graylighter": #444444, + "graylight": #333, + "graylighter": #444, "silver": #b0b0b0, "body": #101010, ), diff --git a/webpack.config.js b/webpack.config.js index 7b462e6d..41355d06 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -1,58 +1,54 @@ -const path = require('path'); +const path = require("path"); module.exports = { entry: { - 'dxpr-theme-header': './js/dist/header/dxpr-theme-header.js', - 'dxpr-theme-multilevel-mobile-nav': './js/dist/multilevel-mobile-nav/dxpr-theme-multilevel-mobile-nav.js', - 'dxpr-theme-settings-admin': './js/dist/settings-admin/dxpr-theme-settings-admin.js', - 'dxpr-theme-settings-sidebar': './js/dist/settings-sidebar/dxpr-theme-settings-sidebar.js', + "dxpr-theme-header": "./js/dist/header/dxpr-theme-header.js", + "dxpr-theme-multilevel-mobile-nav": + "./js/dist/multilevel-mobile-nav/dxpr-theme-multilevel-mobile-nav.js", + "dxpr-theme-settings-admin": + "./js/dist/settings-admin/dxpr-theme-settings-admin.js", + "dxpr-theme-settings-sidebar": + "./js/dist/settings-sidebar/dxpr-theme-settings-sidebar.js", }, output: { - filename: '[name].bundle.min.js', - path: path.resolve(__dirname, 'js/minified'), + filename: "[name].bundle.min.js", + path: path.resolve(__dirname, "js/minified"), }, module: { rules: [ { test: /\.js$/, - include: path.resolve(__dirname, 'js/dist/settings-admin'), - type: 'javascript/dynamic', + include: path.resolve(__dirname, "js/dist/settings-admin"), + type: "javascript/dynamic", use: { - loader: 'babel-loader', + loader: "babel-loader", options: { babelrc: false, - presets: [ - [ - '@babel/preset-env', - { modules: 'commonjs' } - ] - ], + presets: [["@babel/preset-env", { modules: "commonjs" }]], plugins: [ - ['@babel/plugin-transform-runtime', { useESModules: false }] + ["@babel/plugin-transform-runtime", { useESModules: false }], ], }, }, }, { test: /\.js$/, - exclude: [/node_modules/, path.resolve(__dirname, 'js/dist/settings-admin')], + exclude: [ + /node_modules/, + path.resolve(__dirname, "js/dist/settings-admin"), + ], use: { - loader: 'babel-loader', + loader: "babel-loader", options: { babelrc: false, - presets: [ - [ - '@babel/preset-env', - { modules: false } - ] - ], + presets: [["@babel/preset-env", { modules: false }]], plugins: [ - ['@babel/plugin-transform-runtime', { useESModules: false }] + ["@babel/plugin-transform-runtime", { useESModules: false }], ], }, }, }, ], }, - mode: 'production', + mode: "production", };