Skip to content

Commit

Permalink
Merge pull request #234 from eccenca/feature/maintainingDependencies-…
Browse files Browse the repository at this point in the history
…CMEM-6349

Maintain dependencies (CMEM-6349)
  • Loading branch information
andreas-schultz authored Dec 18, 2024
2 parents 2133e1f + 75854ef commit f9a818c
Show file tree
Hide file tree
Showing 5 changed files with 1,198 additions and 664 deletions.
36 changes: 0 additions & 36 deletions .eslintrc.json

This file was deleted.

4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p

## [Unreleased]

### Changed

- `eslint` libraries were upgraded to v9, so `node` v18.18 or higher is required

## [24.0.0] - 2024-12-17

This is a major release, and it might be not compatible with your current usage of our library. Please read about the necessary changes in the section about how to migrate.
Expand Down
57 changes: 57 additions & 0 deletions eslint.config.mjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
import typescriptEslint from "@typescript-eslint/eslint-plugin";
import react from "eslint-plugin-react";
import reactHooks from "eslint-plugin-react-hooks";
import simpleImportSort from "eslint-plugin-simple-import-sort";
import { fixupPluginRules } from "@eslint/compat";
import tsParser from "@typescript-eslint/parser";
import path from "node:path";
import { fileURLToPath } from "node:url";
import js from "@eslint/js";
import { FlatCompat } from "@eslint/eslintrc";

const __filename = fileURLToPath(import.meta.url);
const __dirname = path.dirname(__filename);
const compat = new FlatCompat({
baseDirectory: __dirname,
recommendedConfig: js.configs.recommended,
allConfig: js.configs.all
});

export default [...compat.extends(
"eslint:recommended",
"plugin:@typescript-eslint/eslint-recommended",
"plugin:@typescript-eslint/recommended",
), {
plugins: {
"@typescript-eslint": typescriptEslint,
react,
"react-hooks": fixupPluginRules(reactHooks),
"simple-import-sort": simpleImportSort,
},

languageOptions: {
parser: tsParser,
},

rules: {
"arrow-body-style": "off",
"prefer-arrow-callback": "off",

"simple-import-sort/imports": ["error", {
groups: [
["^react", "^@?\\w"],
["^(@|components)(/.*|$)"],
["^\\u0000"],
["^\\.\\.(?!/?$)", "^\\.\\./?$"],
["^\\./(?=.*/)(?!/?$)", "^\\.(?!/?$)", "^\\./?$"],
["^.+\\.?(css)$"],
],
}],

"@typescript-eslint/ban-ts-comment": ["error", {
"ts-ignore": "allow-with-description",
}],

"no-console": "error",
},
}];
66 changes: 36 additions & 30 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"registry": "https://registry.npmjs.org"
},
"engines": {
"node": ">=18"
"node": ">=18.18.0"
},
"style": "src/index.scss",
"main": "dist/cjs/index.js",
Expand All @@ -47,6 +47,7 @@
"scripts"
],
"scripts": {
"project:clean": "yarn test:clean && yarn build:clean && yarn storybook:clean && rimraf yarn-error.log",
"build:clean": "rimraf dist/",
"build:esm": "tsc --project .typescript/tsbuild-esm.json && ./scripts/fix-esm-dist",
"build:cjs": "tsc --project .typescript/tsbuild-cjs.json && ./scripts/fix-cjs-dist",
Expand All @@ -55,21 +56,23 @@
"compile-scss": "ts-node -O \"{ \\\"esModuleInterop\\\": true, \\\"module\\\": \\\"commonjs\\\"}\" ./scripts/compile-sass.ts",
"storybook": "storybook dev -p 6006 --no-open",
"build-storybook": "storybook build --webpack-stats-json",
"storybook:clean": "rimraf storybook-static/",
"test": "jest",
"test:ci": "jest --ci --reporters='default'",
"test:coverage": "jest --collectCoverage",
"test:generate-output": "jest --json --outputFile=.jest-test-results.json",
"test:clean": "rimraf .jest-test-results.json && rimraf coverage/",
"autolint:scripts": "eslint --fix .storybook/ blueprint/ scripts/ src/ index.ts || exit 0",
"autolint:styles": "stylelint \"{.storybook,src}/**/*.{css,scss}\" --fix || exit 0",
"autolint:prettier": "prettier \"{.github,.storybook,.typescript,blueprint,scripts,src}/**/*\" .* *.json *.md *.ts --write --ignore-unknown",
"autolint:all": "yarn autolint:scripts && yarn autolint:styles && yarn autolint:prettier"
},
"dependencies": {
"@blueprintjs/colors": "^5.1.1",
"@blueprintjs/core": "^5.11.0",
"@blueprintjs/select": "^5.2.2",
"@carbon/icons": "^11.47.1",
"@carbon/react": "^1.64.1",
"@blueprintjs/colors": "^5.1.5",
"@blueprintjs/core": "^5.16.2",
"@blueprintjs/select": "^5.3.7",
"@carbon/icons": "^11.53.0",
"@carbon/react": "^1.72.0",
"@codemirror/lang-json": "^6.0.1",
"@codemirror/lang-markdown": "^6.3.1",
"@codemirror/lang-xml": "^6.1.0",
Expand Down Expand Up @@ -98,44 +101,47 @@
},
"devDependencies": {
"@babel/core": "^7.26.0",
"@babel/plugin-proposal-class-properties": "^7.16.7",
"@babel/plugin-proposal-private-methods": "^7.16.11",
"@babel/plugin-proposal-class-properties": "^7.18.6",
"@babel/plugin-proposal-private-methods": "^7.18.6",
"@babel/plugin-proposal-private-property-in-object": "^7.21.11",
"@babel/preset-env": "^7.26.0",
"@babel/preset-flow": "^7.25.9",
"@babel/preset-react": "^7.25.9",
"@babel/preset-react": "^7.26.3",
"@babel/preset-typescript": "^7.26.0",
"@storybook/addon-actions": "^8.4.3",
"@storybook/addon-essentials": "^8.4.3",
"@storybook/addon-jest": "^8.4.3",
"@storybook/addon-links": "^8.4.3",
"@eslint/compat": "^1.2.4",
"@eslint/eslintrc": "^3.2.0",
"@eslint/js": "^9.17.0",
"@storybook/addon-actions": "^8.4.7",
"@storybook/addon-essentials": "^8.4.7",
"@storybook/addon-jest": "^8.4.7",
"@storybook/addon-links": "^8.4.7",
"@storybook/addon-webpack5-compiler-babel": "^3.0.3",
"@storybook/cli": "^8.4.3",
"@storybook/cli": "^8.4.7",
"@storybook/preset-scss": "^1.0.3",
"@storybook/react": "^8.4.3",
"@storybook/react-webpack5": "^8.4.3",
"@storybook/test": "^8.4.3",
"@storybook/react": "^8.4.7",
"@storybook/react-webpack5": "^8.4.7",
"@storybook/test": "^8.4.7",
"@testing-library/jest-dom": "^6.6.3",
"@testing-library/react": "^12.1.2",
"@types/codemirror": "^5.60.15",
"@types/color": "^3.0.6",
"@types/jest": "^29.5.12",
"@types/lodash": "^4.17.7",
"@types/jest": "^29.5.14",
"@types/lodash": "^4.17.13",
"@types/react-syntax-highlighter": "^15.5.13",
"@typescript-eslint/eslint-plugin": "^5.62.0",
"@typescript-eslint/parser": "^5.62.0",
"@typescript-eslint/eslint-plugin": "^8.18.1",
"@typescript-eslint/parser": "^8.18.1",
"babel-jest": "^29.7.0",
"chromatic": "^11.18.1",
"eslint": "^8.57.0",
"eslint-plugin-react": "^7.35.0",
"eslint-plugin-react-hooks": "^4.6.2",
"chromatic": "^11.20.2",
"eslint": "^9.17.0",
"eslint-plugin-react": "^7.37.2",
"eslint-plugin-react-hooks": "^5.1.0",
"eslint-plugin-simple-import-sort": "^12.1.1",
"husky": "4",
"identity-obj-proxy": "^3.0.0",
"jest": "^29.7.0",
"jest-environment-jsdom": "^29.7.0",
"jest-pnp-resolver": "^1.2.3",
"lint-staged": "^15.2.9",
"lint-staged": "^15.2.11",
"node-sass-package-importer": "^5.3.3",
"path": "^0.12.7",
"prettier": "^2.8.8",
Expand All @@ -145,12 +151,12 @@
"rimraf": "^5.0.10",
"sass": "1.62.1",
"sass-loader": "10.3.1",
"storybook": "^8.4.3",
"storybook": "^8.4.7",
"stylelint": "^15.11.0",
"stylelint-config-recess-order": "^4.6.0",
"stylelint-config-standard-scss": "^9.0.0",
"ts-node": "^10.9.2",
"tsc-esm-fix": "^3.0.2",
"tsc-esm-fix": "^3.1.2",
"typescript": "5.5.3",
"url-loader": "^4.1.1",
"yargs": "^17.7.2"
Expand All @@ -161,8 +167,8 @@
"react-dom": ">=16"
},
"resolutions": {
"**/@types/react": "^17.0.80",
"node-sass-package-importer/**/postcss": "^8.4.41",
"**/@types/react": "^17.0.83",
"node-sass-package-importer/**/postcss": "^8.4.49",
"**/cross-spawn": "^7.0.5 ",
"**/micromatch": "^4.0.8"
},
Expand Down
Loading

0 comments on commit f9a818c

Please sign in to comment.