Merge branch 'develop'

Author: elbakerino

.eslintignore

@@ -0,0 +1,4 @@
+node_modules
+packages/*/build
+packerConfig.js
+sloc.js

packages/.eslintrc .eslintrcpackages/.eslintrc renamed to .eslintrc

@@ -143,7 +143,19 @@
                     "warn",
                     "never"
                 ],
-                "semi-style": "off"
+                "semi-style": "off",
+                "no-restricted-imports": [
+                    "error",
+                    {
+                        "paths": [
+                            "@mui/material",
+                            "@mui/icon-material"
+                        ],
+                        "patterns": [
+                            "@mui/*/*/*"
+                        ]
+                    }
+                ]
             }
         }
     ]

.github/workflows/blank.yml

@@ -49,7 +49,7 @@ jobs:
 
             -   name: Run tests
                 run: |
-                    npm test
+                    npm run check
 
             -   name: Build
                 run: |

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2022 bemit UG (haftungsbeschränkt)
+Copyright (c) 2024 bemit UG (haftungsbeschränkt)
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -35,4 +35,4 @@ See [CONTRIBUTING.md](CONTRIBUTING.md).
 
 This project is free software distributed under the **[MIT LICENSE](LICENSE)**.
 
-© 2022 bemit UG (haftungsbeschränkt)
+© 2024 bemit UG (haftungsbeschränkt)

packages/jest.config.ts jest.config.tspackages/jest.config.ts renamed to jest.config.ts

@@ -2,14 +2,6 @@ import type { Config } from '@jest/types'
 
 const packages: string[] = ['material-color', 'material-colorful']
 
-const testMatchesLint: string[] = []
-
-packages.forEach(pkg => {
-    testMatchesLint.push(...[
-        '<rootDir>/' + pkg + '/src/**/*.(js|ts|tsx)',
-        '<rootDir>/' + pkg + '/tests/**/*.(test|spec|d).(js|ts|tsx)',
-    ])
-})
 const base: Partial<Config.InitialOptions> = {
     /*transformIgnorePatterns: [
         'node_modules/?!(@ui-schema)',
@@ -18,8 +10,8 @@ const base: Partial<Config.InitialOptions> = {
         '^.+\\.tsx?$': 'ts-jest',
     },*/
     moduleNameMapper: {
-        '^@ui-schema/material-color(.*)$': '<rootDir>/material-color/src$1',
-        '^@ui-schema/material-colorful(.*)$': '<rootDir>/material-colorful/src$1',
+        '^@ui-schema/material-color(.*)$': '<rootDir>/packages/material-color/src$1',
+        '^@ui-schema/material-colorful(.*)$': '<rootDir>/packages/material-colorful/src$1',
     },
     moduleFileExtensions: [
         'ts',
@@ -46,26 +38,20 @@ const config: Config.InitialOptions = {
         ...packages.map(pkg => ({
             displayName: 'test-' + pkg,
             ...base,
-            moduleDirectories: ['node_modules', '<rootDir>/' + pkg + '/node_modules'],
-            //moduleDirectories: ['node_modules', '<rootDir>/ui-schema/node_modules', '<rootDir>/ds-material/node_modules'],
+            moduleDirectories: ['node_modules', '<rootDir>/packages/' + pkg + '/node_modules'],
+            //moduleDirectories: ['node_modules', '<rootDir>/packages/ui-schema/node_modules', '<rootDir>/packages/ds-material/node_modules'],
             // todo: check why `transformIgnorePatterns`, combined with multi-projects/lerna 0.5.3 upgrade, throws `TypeError: /node_modules/jest-runner-eslint/build/runner/index.js: node_modules/@ampproject/remapping/dist/remapping.umd.js: _remapping(...) is not a function`
             /*transformIgnorePatterns: [
                 'node_modules/?!(@ui-schema)',
             ],*/
             //testEnvironmentOptions: {},
             testMatch: [
-                '<rootDir>/' + pkg + '/src/**/*.(test|spec).(js|ts|tsx)',
-                '<rootDir>/' + pkg + '/tests/**/*.(test|spec).(js|ts|tsx)',
+                '<rootDir>/packages/' + pkg + '/src/**/*.(test|spec).(js|ts|tsx)',
+                '<rootDir>/packages/' + pkg + '/tests/**/*.(test|spec).(js|ts|tsx)',
             ],
         })),
-        {
-            displayName: 'lint',
-            runner: 'jest-runner-eslint',
-            ...base,
-            testMatch: testMatchesLint,
-        },
     ],
-    coverageDirectory: '<rootDir>/../coverage',
+    coverageDirectory: '<rootDir>/coverage',
 }
 
 export default config