Skip to content

Commit

Permalink
Merge branch 'main' into popover_overflowmenu_bug
Browse files Browse the repository at this point in the history
  • Loading branch information
riddhybansal authored Jun 20, 2024
2 parents cd693b1 + 47ef3e4 commit e30e7ec
Show file tree
Hide file tree
Showing 81 changed files with 410 additions and 740 deletions.
47 changes: 0 additions & 47 deletions .eslintignore

This file was deleted.

Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
2 changes: 1 addition & 1 deletion config/eslint-config-carbon/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"provenance": true
},
"peerDependencies": {
"eslint": "^8.0.0"
"eslint": "^9.0.0"
},
"dependencies": {
"@babel/eslint-parser": "^7.19.1",
Expand Down
75 changes: 75 additions & 0 deletions eslint.config.mjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
export default [
{
languageOptions: {
parser: {
meta: {
name: 'Ignore Without Parsing',
},

// Ignore Paring error
parse: function () {
return {
type: 'Program',
loc: {},
comments: [],
range: [0, 0],
body: [],
tokens: [],
};
},
},
},
},

{
ignores: [
// Build folders
'/build',
'packages/*/build/',
'packages/*/examples/*/build/',
'es',
'lib',
'dist',
'umd',

'node_modules',
'packages/*/examples/*',

// Components
'packages/components/demo/*.css',
'packages/components/demo/*.map',
'packages/components/demo/*.js',
'packages/components/demo/js/prism.js',
'packages/components/demo/hot',
'!packages/components/demo/index.js', // This negation might need manual handling
'packages/components/dist',
'packages/components/tests/a11y-results',
'packages/components/tests/coverage',
'packages/components/es',
'packages/components/umd',
'packages/components/scripts',
'packages/components/css',
'packages/components/scss',
'packages/components/html',
'packages/components/docs/js',
'packages/components/node_modules',
'packages/components/scss/globals/vendor/**',
'packages/components/src/globals/scss/vendor/**',

// Upgrade
'**/__testfixtures__/**',
'packages/upgrade/cli.js',

// React
'**/storybook-static/**',
'packages/react/icons/index.js',
'packages/react/icons/index.esm.js',

// Icons React
'packages/icons-react/next/**',

// Templates
'packages/cli/src/component/templates/**',
],
},
];
4 changes: 2 additions & 2 deletions examples/class-prefix/package.json
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{
"name": "class-prefix",
"private": true,
"version": "0.57.0-rc.0",
"version": "0.57.0",
"type": "module",
"scripts": {
"dev": "vite",
"build": "vite build",
"preview": "vite preview"
},
"dependencies": {
"@carbon/react": "^1.60.0-rc.0",
"@carbon/react": "^1.60.0",
"react": "^18.2.0",
"react-dom": "^18.2.0"
},
Expand Down
4 changes: 2 additions & 2 deletions examples/codesandbox-styles/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "codesandbox-styles",
"private": true,
"version": "0.63.0-rc.0",
"version": "0.63.0",
"type": "module",
"scripts": {
"dev": "vite"
Expand All @@ -11,6 +11,6 @@
"vite": "^4.3.8"
},
"dependencies": {
"@carbon/styles": "^1.60.0-rc.0"
"@carbon/styles": "^1.60.0"
}
}
4 changes: 2 additions & 2 deletions examples/custom-theme/package.json
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{
"name": "custom-theme",
"private": true,
"version": "0.58.0-rc.0",
"version": "0.58.0",
"type": "module",
"scripts": {
"dev": "vite",
"build": "vite build",
"preview": "vite preview"
},
"dependencies": {
"@carbon/react": "^1.60.0-rc.0",
"@carbon/react": "^1.60.0",
"react": "^18.2.0",
"react-dom": "^18.2.0"
},
Expand Down
4 changes: 2 additions & 2 deletions examples/id-prefix/package.json
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{
"name": "id-prefix",
"private": true,
"version": "0.57.0-rc.0",
"version": "0.57.0",
"type": "module",
"scripts": {
"dev": "vite",
"build": "vite build",
"preview": "vite preview"
},
"dependencies": {
"@carbon/react": "^1.60.0-rc.0",
"@carbon/react": "^1.60.0",
"react": "^18.2.0",
"react-dom": "^18.2.0"
},
Expand Down
24 changes: 0 additions & 24 deletions examples/incremental-migration-vite/.gitignore

This file was deleted.

51 changes: 2 additions & 49 deletions examples/incremental-migration-vite/README.md
Original file line number Diff line number Diff line change
@@ -1,51 +1,4 @@
## Incremental migration

We have recently released a new version, v11, of our component library and a
common question we receive is if users can adopt v11 incrementally and the
answer is yes! If the burden of migrating to v11 is too big to take on all at
once, but there are features of our latest release you want to take advantage
of, it is likely that you can pull in just the parts you are wanting to use
while keeping the rest of your Carbon usage the same.

This example illustrates how v11 and v10 work together.

## Getting Started

First, run `yarn build` in the root of the `carbon` repository.

```sh
yarn install && yarn build
```

Now, all you need to do is `cd` into the directory and run:

```sh
yarn install
# or
npm install


yarn dev
# or
npm run dev
```

This example only takes a little bit of time to start, once it's up and running,
it's very fast.

Open [http://localhost:5173](http://localhost:5173) with your browser to see the
result.

## Sass

First and foremost, if you want to use v11 styles in any capacity, you'll have
to migrate to use `dart-sass`. `node-sass` has been deprecated and we migrated
to `dart-sass` in v11. For more information about migrating, visit our docs
[here](https://github.com/carbon-design-system/carbon/blob/main/docs/migration/v11.md#changing-from-node-sass-to-sass).

## V10 and V11

This example is mainly v10, but it takes advantage of the new Stack component
from v11 and uses v11's StructuredList component 🎉. StructuredList had a major
accessibilty revamp in v11 that you might want to use and this examples shows
you how.
This example has moved to:
https://stackblitz.com/edit/github-gng7o6?file=README.md
13 changes: 0 additions & 13 deletions examples/incremental-migration-vite/index.html

This file was deleted.

27 changes: 0 additions & 27 deletions examples/incremental-migration-vite/package.json

This file was deleted.

Loading

0 comments on commit e30e7ec

Please sign in to comment.