Skip to content
Merged
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
28 changes: 0 additions & 28 deletions babel.config.js

This file was deleted.

24 changes: 11 additions & 13 deletions eslint.config.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
const babelParser = require('@babel/eslint-parser');
const js = require('@eslint/js');
const prettier = require('eslint-config-prettier');
const importPlugin = require('eslint-plugin-import');
const { importX } = require('eslint-plugin-import-x');
const jest = require('eslint-plugin-jest');
const jestDOM = require('eslint-plugin-jest-dom');
const simpleImportSort = require('eslint-plugin-simple-import-sort');
Expand All @@ -23,12 +22,11 @@ module.exports = [
],
},
js.configs.recommended,
importPlugin.flatConfigs.recommended,
importX.flatConfigs.recommended,
prettier,
{
files: ['**/*.{js,mjs,cjs,ts,cts,mts}'],
languageOptions: {
parser: babelParser,
globals: {
...globals.node,
...globals.es2021,
Expand All @@ -38,7 +36,7 @@ module.exports = [
},
},
settings: {
'import/resolver': {
'import-x/resolver': {
node: {},
webpack: {
config: {
Expand All @@ -56,19 +54,19 @@ module.exports = [
},
},
},
'import/external-module-folders': ['node_modules'],
'import-x/external-module-folders': ['node_modules'],
},
rules: {
'no-console': 1,
'no-warning-comments': ['warn', { terms: ['todo', 'fixme', '@@@'] }],
'import/first': 'warn',
'import/newline-after-import': 'warn',
'import/no-duplicates': ['error', { 'prefer-inline': true }],
'import/order': [
'import-x/first': 'warn',
'import-x/newline-after-import': 'warn',
'import-x/no-duplicates': ['error', { 'prefer-inline': true }],
'import-x/order': [
'warn',
{ 'newlines-between': 'always', alphabetize: { order: 'asc' } },
],
'import/named': 'warn',
'import-x/named': 'warn',
},
},
{
Expand All @@ -88,7 +86,7 @@ module.exports = [
rules: {
'simple-import-sort/imports': 'warn',
'simple-import-sort/exports': 'warn',
'import/order': 'off',
'import-x/order': 'off',
},
},
{
Expand Down Expand Up @@ -124,7 +122,7 @@ module.exports = [
rules: {
'simple-import-sort/imports': 'warn',
'simple-import-sort/exports': 'warn',
'import/order': 'off',
'import-x/order': 'off',
},
},
];
4 changes: 3 additions & 1 deletion jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,9 @@ module.exports = {
// timers: "real",

// A map from regular expressions to paths to transformers
// transform: undefined,
transform: {
'^.+\\.js$': '@swc/jest',
},

// An array of regexp pattern strings that are matched against all source file paths, matched files will skip transformation
// transformIgnorePatterns: [
Expand Down
34 changes: 15 additions & 19 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -82,34 +82,30 @@
"sassdoc": "^2.5.0"
},
"devDependencies": {
"@babel/core": "^7.29.0",
"@babel/eslint-parser": "^7.28.6",
"@babel/preset-env": "^7.29.0",
"@eslint/js": "^9.39.3",
"@eslint/js": "^10.0.1",
"@swc/core": "^1.15.21",
"@swc/jest": "^0.2.39",
"@testing-library/dom": "^10.4.1",
"@testing-library/jest-dom": "^6.9.1",
"accoutrement": "^4.0.7",
"autoprefixer": "^10.4.27",
"babel-jest": "^30.2.0",
"babel-loader": "^10.0.0",
"chalk": "^4.1.2",
"core-js": "^3.48.0",
"css-loader": "^7.1.4",
"css-minimizer-webpack-plugin": "^8.0.0",
"cssremedy": "^0.1.0-beta.2",
"del": "^6.1.1",
"eslint": "^9.39.3",
"eslint": "^10.1.0",
"eslint-config-prettier": "^10.1.8",
"eslint-import-resolver-node": "^0.3.9",
"eslint-import-resolver-webpack": "^0.13.10",
"eslint-plugin-import": "^2.32.0",
"eslint-plugin-jest": "^29.15.0",
"eslint-plugin-import-x": "^4.16.2",
"eslint-plugin-jest": "^29.15.1",
"eslint-plugin-jest-dom": "^5.5.0",
"eslint-plugin-simple-import-sort": "^12.1.1",
"globals": "^17.4.0",
"highlight.js": "^11.11.1",
"jest": "^30.2.0",
"jest-environment-jsdom": "^30.2.0",
"jest": "^30.3.0",
"jest-environment-jsdom": "^30.3.0",
"jest-junit": "^16.0.0",
"jinja-loader": "^0.0.8",
"jquery": "^4.0.0",
Expand All @@ -119,30 +115,30 @@
"lodash": "^4.17.23",
"mark.js": "^8.11.1",
"matchmedia-polyfill": "^0.3.2",
"mini-css-extract-plugin": "^2.10.0",
"mini-css-extract-plugin": "^2.10.2",
"mocha": "^11.7.5",
"mocha-junit-reporter": "^2.2.1",
"npm-run-all": "^4.1.5",
"nyc": "^18.0.0",
"postcss": "^8.5.8",
"postcss-loader": "^8.2.1",
"prettier": "^3.8.1",
"sass": "^1.97.3",
"sass-embedded": "^1.97.3",
"sass": "^1.98.0",
"sass-embedded": "^1.98.0",
"sass-loader": "^16.0.7",
"sass-true": "^10.1.0",
"sassdoc": "^2.7.4",
"sinon": "^21.0.2",
"sinon": "^21.0.3",
"srcdoc-polyfill": "^1.0.0",
"stylelint": "^17.4.0",
"stylelint": "^17.6.0",
"stylelint-config-standard-scss": "^17.0.0",
"svgo": "^4.0.1",
"webpack": "^5.105.4",
"webpack-cli": "^6.0.1",
"webpack-cli": "^7.0.2",
"webpack-dev-server": "^5.2.3"
},
"resolutions": {
"cdocparser": "^0.15.0"
},
"packageManager": "yarn@4.12.0"
"packageManager": "yarn@4.13.0"
}
4 changes: 3 additions & 1 deletion sassdoc-webpack-plugin.js
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,9 @@ class SassDocPlugin {
);
} catch (err) {
console.warn(err);
throw new Error(`Invalid or no .sassdocrc found in: ${process.cwd()}`);
throw new Error(`Invalid or no .sassdocrc found in: ${process.cwd()}`, {
cause: err,
});
}
}

Expand Down
1 change: 1 addition & 0 deletions test/clientjs/setupTests.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import '@testing-library/jest-dom';

// eslint-disable-next-line import-x/no-named-as-default
import $ from 'jquery/slim';

beforeAll(() => {
Expand Down
5 changes: 0 additions & 5 deletions webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -168,11 +168,6 @@ module.exports = {
],
module: {
rules: [
{
test: /(assets\/js\/.*\.js$|test\/clientjs\/.*\.js$)/,
exclude: /node_modules/,
use: ['babel-loader'],
},
{
test: /\.njk$/,
use: [
Expand Down
Loading