Skip to content

Commit 55dafcd

Browse files
authored
Merge branch 'master' into missing-icons
Signed-off-by: Kishore B <85435355+kishore08-07@users.noreply.github.com>
2 parents 6cd1998 + fd755d7 commit 55dafcd

File tree

116 files changed

+6726
-5319
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

116 files changed

+6726
-5319
lines changed

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
- name: "Set Package Version"
4141
uses: reedyuk/npm-version@1.1.1
4242
with:
43-
version: ${{ github.event.release.tag_name }}
43+
version: ${{ github.event.release.tag_name || inputs.tag_name }}
4444

4545
- name: Install, Build, and Publish Package
4646
run: |

.github/workflows/test-meshery-integration.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,10 @@ jobs:
5151
uses: actions/checkout@v6
5252
with:
5353
repository: meshery/meshery
54+
# Pin to last known-good commit before the @mui/x-tree-view v8 upgrade
55+
# that broke the TreeView import (meshery/meshery#18163).
56+
# Remove this pin once meshery/meshery#18167 is merged.
57+
ref: 7c3d02c91365dc776b11ffc50aab277026e86701
5458
path: meshery
5559
fetch-depth: 1
5660

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,9 @@ dist/**
2525
packages/dist/**
2626
packages/design-system/node_modules/**
2727

28-
**/storybook-static/**
2928
pub.sh
3029
.eslintcache
3130

31+
.DS_Store.eslintcache
32+
3233
.DS_Store

eslint.config.js

Lines changed: 4 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,10 @@
1-
const { FlatCompat } = require("@eslint/eslintrc");
21
const js = require("@eslint/js");
32
const tsParser = require("@typescript-eslint/parser");
43
const react = require("eslint-plugin-react");
54
const reactHooks = require("eslint-plugin-react-hooks");
65
const typescript = require("@typescript-eslint/eslint-plugin");
7-
const storybook = require("eslint-plugin-storybook");
8-
const importPlugin = require("eslint-plugin-import");
96
const globals = require("globals");
107

11-
const compat = new FlatCompat({
12-
baseDirectory: __dirname,
13-
recommendedConfig: js.configs.recommended,
14-
allConfig: js.configs.all
15-
});
16-
178
module.exports = [
189
// Global ignores
1910
{
@@ -36,11 +27,11 @@ module.exports = [
3627
"**/coverage/**",
3728
]
3829
},
39-
30+
4031
// Test files configuration
4132
{
4233
files: ["**/*.test.{js,jsx,ts,tsx}", "**/__tests__/**/*.{js,jsx,ts,tsx}"],
43-
34+
4435
languageOptions: {
4536
globals: {
4637
...globals.browser,
@@ -65,23 +56,12 @@ module.exports = [
6556
react,
6657
"react-hooks": reactHooks,
6758
"@typescript-eslint": typescript,
68-
"import": importPlugin,
69-
storybook,
7059
},
7160

7261
rules: {
73-
// ESLint recommended rules
7462
...js.configs.recommended.rules,
75-
76-
// TypeScript recommended rules
7763
...typescript.configs.recommended.rules,
78-
79-
// React hooks recommended rules
8064
...reactHooks.configs.recommended.rules,
81-
82-
// Storybook recommended rules
83-
...storybook.configs.recommended.rules,
84-
"import/first": "error",
8565
},
8666

8767
settings: {
@@ -95,11 +75,11 @@ module.exports = [
9575
},
9676
},
9777

98-
// Main configuration - matches old .eslintrc.js
78+
// Main configuration
9979
{
10080
files: ["**/*.{js,jsx,ts,tsx}"],
10181
ignores: ["**/*.test.{js,jsx,ts,tsx}", "**/__tests__/**/*.{js,jsx,ts,tsx}"],
102-
82+
10383
languageOptions: {
10484
globals: {
10585
...globals.browser,
@@ -123,23 +103,12 @@ module.exports = [
123103
react,
124104
"react-hooks": reactHooks,
125105
"@typescript-eslint": typescript,
126-
"import": importPlugin,
127-
storybook,
128106
},
129107

130108
rules: {
131-
// ESLint recommended rules
132109
...js.configs.recommended.rules,
133-
134-
// TypeScript recommended rules
135110
...typescript.configs.recommended.rules,
136-
137-
// React hooks recommended rules
138111
...reactHooks.configs.recommended.rules,
139-
140-
// Storybook recommended rules
141-
...storybook.configs.recommended.rules,
142-
"import/first": "error",
143112
},
144113

145114
settings: {

examples/next-12/components/ModeToggleButton.jsx

Lines changed: 0 additions & 29 deletions
This file was deleted.

examples/next-12/components/ResponsiveDataTable/ResponsiveDataTable.jsx

Lines changed: 0 additions & 94 deletions
This file was deleted.

examples/next-12/next.config.js

Lines changed: 0 additions & 6 deletions
This file was deleted.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)